mirror of
https://repository.entgra.net/community/device-mgt-core.git
synced 2025-10-06 02:01:45 +00:00
Fix macos enrollment error due to invalid challenge token
This commit is contained in:
parent
5962a24029
commit
2da0a6aa19
@ -49,6 +49,8 @@ import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
@Path("/admin/certificates")
|
||||
public class CertificateManagementAdminServiceImpl implements CertificateManagementAdminService {
|
||||
@ -242,7 +244,11 @@ public class CertificateManagementAdminServiceImpl implements CertificateManagem
|
||||
String challengeToken = certMgtService.extractChallengeToken(cert);
|
||||
|
||||
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();
|
||||
|
||||
SCEPManager scepManager = CertificateMgtAPIUtils.getSCEPManagerService();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user