community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mac-os' into 'mac-os'

Browse Source 
Fix mac-os enrollment error due to invalid challenge token

See merge request entgra/carbon-device-mgt!98
This commit is contained in:
Inosh Perara 2019-06-01 11:17:32 +00:00
commit 6296b1dd5f
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/impl/CertificateManagementAdminServiceImpl.java
View File

@ -49,6 +49,8 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@Path("/admin/certificates") @Path("/admin/certificates")
public class CertificateManagementAdminServiceImpl implements CertificateManagementAdminService { public class CertificateManagementAdminServiceImpl implements CertificateManagementAdminService {
@ -242,7 +244,11 @@ public class CertificateManagementAdminServiceImpl implements CertificateManagem
String challengeToken = certMgtService.extractChallengeToken(cert); String challengeToken = certMgtService.extractChallengeToken(cert);
if (challengeToken != null) { if (challengeToken != null) {
challengeToken = challengeToken.replace("\u0004&\u0013$",""); Pattern regexPattern = Pattern.compile("[a-zA-Z0-9][a-zA-Z0-9-]+$");
Matcher regexMatcher = regexPattern.matcher(challengeToken);
if (regexMatcher.find()) {
challengeToken = regexMatcher.group();
}
challengeToken = challengeToken.substring(challengeToken.indexOf("(") + 1).trim(); challengeToken = challengeToken.substring(challengeToken.indexOf("(") + 1).trim();
SCEPManager scepManager = CertificateMgtAPIUtils.getSCEPManagerService(); SCEPManager scepManager = CertificateMgtAPIUtils.getSCEPManagerService();