Shikong/gb28181-docking-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

摘要认证 调整

Browse Source
This commit is contained in:
shikong 2023-09-26 14:33:04 +08:00
parent 84cab3441f
commit b1d3d2d235
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gb28181-sip/src/main/java/cn/skcks/docking/gb28181/sip/utils/DigestAuthenticationHelper.java
View File

@ -220,7 +220,7 @@ public class DigestAuthenticationHelper {
} }
@SneakyThrows @SneakyThrows
public static AuthorizationHeader createAuthorization(String serverIp, int serverPort, String serverId, String deviceId,String password, WWWAuthenticateHeader www){ public static AuthorizationHeader createAuthorization(String method,String serverIp, int serverPort, String serverId, String deviceId,String password, WWWAuthenticateHeader www){
String hostAddress = SipBuilder.createHostAddress(serverIp, serverPort); String hostAddress = SipBuilder.createHostAddress(serverIp, serverPort);
SipURI sipURI = SipBuilder.createSipURI(serverId, hostAddress); SipURI sipURI = SipBuilder.createSipURI(serverId, hostAddress);
if (www == null) { if (www == null) {
@ -249,7 +249,7 @@ public class DigestAuthenticationHelper {
} }
} }
String HA1 = DigestUtil.md5Hex((deviceId + ":" + realm + ":" + password).getBytes()); String HA1 = DigestUtil.md5Hex((deviceId + ":" + realm + ":" + password).getBytes());
String HA2= DigestUtil.md5Hex((Request.REGISTER + ":" + sipURI.toString()).getBytes()); String HA2= DigestUtil.md5Hex((method.toUpperCase() + ":" + sipURI.toString()).getBytes());
StringBuilder reStr = new StringBuilder(); StringBuilder reStr = new StringBuilder();
reStr.append(HA1); reStr.append(HA1);

6
gb28181-sip/src/test/java/cn/skcks/docking/gb28181/sip/utils/AuthenticationTest.java
View File

@ -17,17 +17,17 @@ public class AuthenticationTest {
@Test @Test
void test() { void test() {
AuthorizationHeader authorization = DigestAuthenticationHelper.createAuthorization(serverIp, serverPort, serverId, deviceId, "123456",null); AuthorizationHeader authorization = DigestAuthenticationHelper.createAuthorization(Request.REGISTER, serverIp, serverPort, serverId, deviceId, "123456", null);
log.info("\n{}", authorization); log.info("\n{}", authorization);
WWWAuthenticateHeader wwwAuthenticateHeader = DigestAuthenticationHelper.generateChallenge(domain); WWWAuthenticateHeader wwwAuthenticateHeader = DigestAuthenticationHelper.generateChallenge(domain);
log.info("\n{}", wwwAuthenticateHeader); log.info("\n{}", wwwAuthenticateHeader);
authorization = DigestAuthenticationHelper.createAuthorization(serverIp, serverPort, serverId, deviceId, "123456",wwwAuthenticateHeader); authorization = DigestAuthenticationHelper.createAuthorization(Request.REGISTER, serverIp, serverPort, serverId, deviceId, "123456", wwwAuthenticateHeader);
log.info("\n{}", authorization); log.info("\n{}", authorization);
boolean passed = DigestAuthenticationHelper.doAuthenticatePlainTextPassword(Request.REGISTER, authorization, "123456"); boolean passed = DigestAuthenticationHelper.doAuthenticatePlainTextPassword(Request.REGISTER, authorization, "123456");
log.info("authorization passed {}",passed); log.info("authorization passed {}", passed);
} }
} }