Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

适配注册时多个qop的情形

2.7.1
648540858 2024-09-11 10:26:17 +08:00
parent a915897c53
commit 933efb48cc
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderPlarformProvider.java
View File

@ -25,6 +25,8 @@ import javax.sip.message.Request;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.text.ParseException; import java.text.ParseException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet;
import java.util.Set;
import java.util.UUID; import java.util.UUID;
/** /**
@ -91,7 +93,6 @@ public class SIPRequestHeaderPlarformProvider {
public Request createRegisterRequest(@NotNull ParentPlatform parentPlatform, String fromTag, String toTag, public Request createRegisterRequest(@NotNull ParentPlatform parentPlatform, String fromTag, String toTag,
WWWAuthenticateHeader www , CallIdHeader callIdHeader, int expires) throws ParseException, PeerUnavailableException, InvalidArgumentException { WWWAuthenticateHeader www , CallIdHeader callIdHeader, int expires) throws ParseException, PeerUnavailableException, InvalidArgumentException {
Request registerRequest = createRegisterRequest(parentPlatform, redisCatchStorage.getCSEQ(), fromTag, toTag, callIdHeader, expires); Request registerRequest = createRegisterRequest(parentPlatform, redisCatchStorage.getCSEQ(), fromTag, toTag, callIdHeader, expires);
SipURI requestURI = SipFactory.getInstance().createAddressFactory().createSipURI(parentPlatform.getServerGBId(), parentPlatform.getServerIP() + ":" + parentPlatform.getServerPort()); SipURI requestURI = SipFactory.getInstance().createAddressFactory().createSipURI(parentPlatform.getServerGBId(), parentPlatform.getServerIP() + ":" + parentPlatform.getServerPort());
if (www == null) { if (www == null) {
@ -115,17 +116,31 @@ public class SIPRequestHeaderPlarformProvider {
// 参考 https://blog.csdn.net/y673533511/article/details/88388138 // 参考 https://blog.csdn.net/y673533511/article/details/88388138
// qop 保护质量 包含auth（默认的）和auth-int（增加了报文完整性检测）两种策略 // qop 保护质量 包含auth（默认的）和auth-int（增加了报文完整性检测）两种策略
String qop = www.getQop(); String qop = www.getQop();
String opaque = www.getOpaque();
String cNonce = null; String cNonce = null;
String nc = "00000001"; String nc = "00000001";
if (qop != null) { if (qop != null) {
if ("auth".equalsIgnoreCase(qop)) { if (qop.indexOf(",") > 0) {
// 客户端随机数，这是一个不透明的字符串值，由客户端提供，并且客户端和服务器都会使用，以避免用明文文本。 String[] qopArray = qop.split(",");
// 这使得双方都可以查验对方的身份，并对消息的完整性提供一些保护 Set<String> qopSet = new HashSet<String>();
cNonce = UUID.randomUUID().toString(); for (String qopItem : qopArray) {
qopSet.add(qopItem);
}
if (qopSet.contains("auth")) {
cNonce = UUID.randomUUID().toString();
}else if ("auth-int".equalsIgnoreCase(qop)){
// TODO
}
}else {
if ("auth".equalsIgnoreCase(qop)) {
// 客户端随机数，这是一个不透明的字符串值，由客户端提供，并且客户端和服务器都会使用，以避免用明文文本。
// 这使得双方都可以查验对方的身份，并对消息的完整性提供一些保护
}else if ("auth-int".equalsIgnoreCase(qop)){
// TODO }else if ("auth-int".equalsIgnoreCase(qop)){
// TODO
}
} }
} }
String HA1 = DigestUtils.md5DigestAsHex((parentPlatform.getDeviceGBId() + ":" + realm + ":" + parentPlatform.getPassword()).getBytes()); String HA1 = DigestUtils.md5DigestAsHex((parentPlatform.getDeviceGBId() + ":" + realm + ":" + parentPlatform.getPassword()).getBytes());
@ -157,9 +172,14 @@ public class SIPRequestHeaderPlarformProvider {
authorizationHeader.setAlgorithm("MD5"); authorizationHeader.setAlgorithm("MD5");
if (qop != null) { if (qop != null) {
authorizationHeader.setQop(qop); authorizationHeader.setQop(qop);
}
if (cNonce != null) {
authorizationHeader.setCNonce(cNonce); authorizationHeader.setCNonce(cNonce);
authorizationHeader.setNonceCount(1); authorizationHeader.setNonceCount(1);
} }
if (opaque != null) {
authorizationHeader.setOpaque(opaque);
}
registerRequest.addHeader(authorizationHeader); registerRequest.addHeader(authorizationHeader);
return registerRequest; return registerRequest;