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

添加注册失败时回复403避免陷入401循环

pull/110/head
64850858 2021-06-08 14:43:03 +08:00
parent 57b562d622
commit abd569d79a
6 changed files with 124 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/main/java/com/genersoft/iot/vmp/gb28181/auth/DigestServerAuthenticationHelper.java
View File

@ -241,4 +241,59 @@ public class DigestServerAuthenticationHelper {
return mdString.equals(response); return mdString.equals(response);
} }
public static void main(String[] args) throws NoSuchAlgorithmException {
String realm = "4401000000";
String username = "44010000001110008008";
String nonce = "0074b397f86fc263b1b7f9eb72553267";
String uri = "sip:44010000002000000001@4401000000";
// qop 保护质量 包含auth（默认的）和auth-int（增加了报文完整性检测）两种策略
String qop = null;
// 客户端随机数，这是一个不透明的字符串值，由客户端提供，并且客户端和服务器都会使用，以避免用明文文本。
// 这使得双方都可以查验对方的身份，并对消息的完整性提供一些保护
//String cNonce = authHeader.getCNonce();
// nonce计数器，是一个16进制的数值，表示同一nonce下客户端发送出请求的数量
int nc = -1;
String ncStr = new DecimalFormat("00000000").format(nc);
// String ncStr = new DecimalFormat("00000000").format(Integer.parseInt(nc + "", 16));
MessageDigest messageDigest = MessageDigest.getInstance(DEFAULT_ALGORITHM);
String A1 = username + ":" + realm + ":" + "crservice@123";
String A2 = "REGISTER" + ":" + uri.toString();
byte mdbytes[] = messageDigest.digest(A1.getBytes());
String HA1 = toHexString(mdbytes);
System.out.println("A1: " + A1);
System.out.println("A2: " + A2);
mdbytes = messageDigest.digest(A2.getBytes());
String HA2 = toHexString(mdbytes);
System.out.println("HA1: " + HA1);
System.out.println("HA2: " + HA2);
String cnonce = null;
System.out.println("nonce: " + nonce);
System.out.println("nc: " + ncStr);
System.out.println("cnonce: " + cnonce);
System.out.println("qop: " + qop);
String KD = HA1 + ":" + nonce;
if (qop != null && qop.equals("auth") ) {
if (nc != -1) {
KD += ":" + ncStr;
}
if (cnonce != null) {
KD += ":" + cnonce;
}
KD += ":" + qop;
}
KD += ":" + HA2;
System.out.println("KD: " + KD);
mdbytes = messageDigest.digest(KD.getBytes());
String mdString = toHexString(mdbytes);
System.out.println("mdString: " + mdString);
String response = "fdb1608a7a3b96f0598f40b8ba78d6a9";
System.out.println("response: " + response);
}
} }

118
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/RegisterRequestProcessor.java
View File

@ -89,7 +89,7 @@ public class RegisterRequestProcessor extends SIPRequestAbstractProcessor {
} }
// 未携带授权头或者密码错误 回复401 // 未携带授权头或者密码错误 回复401
if (authorhead == null || !passwordCorrect) { if (authorhead == null ) {
if (authorhead == null) { if (authorhead == null) {
logger.info("[{}] 未携带授权头 回复401", requestAddress); logger.info("[{}] 未携带授权头 回复401", requestAddress);
@ -98,65 +98,71 @@ public class RegisterRequestProcessor extends SIPRequestAbstractProcessor {
} }
response = getMessageFactory().createResponse(Response.UNAUTHORIZED, request); response = getMessageFactory().createResponse(Response.UNAUTHORIZED, request);
new DigestServerAuthenticationHelper().generateChallenge(getHeaderFactory(), response, sipConfig.getSipDomain()); new DigestServerAuthenticationHelper().generateChallenge(getHeaderFactory(), response, sipConfig.getSipDomain());
} }else {
// 携带授权头并且密码正确 if (!passwordCorrect){
else if (passwordCorrect) { // 注册失败
response = getMessageFactory().createResponse(Response.OK, request); response = getMessageFactory().createResponse(Response.FORBIDDEN, request);
// 添加date头 response.setReasonPhrase("wrong password");
SIPDateHeader dateHeader = new SIPDateHeader(); }else {
// 使用自己修改的 // 携带授权头并且密码正确
WvpSipDate wvpSipDate = new WvpSipDate(Calendar.getInstance(Locale.ENGLISH).getTimeInMillis()); response = getMessageFactory().createResponse(Response.OK, request);
dateHeader.setDate(wvpSipDate); // 添加date头
response.addHeader(dateHeader); SIPDateHeader dateHeader = new SIPDateHeader();
// 使用自己修改的
WvpSipDate wvpSipDate = new WvpSipDate(Calendar.getInstance(Locale.ENGLISH).getTimeInMillis());
dateHeader.setDate(wvpSipDate);
response.addHeader(dateHeader);
ExpiresHeader expiresHeader = (ExpiresHeader) request.getHeader(Expires.NAME); ExpiresHeader expiresHeader = (ExpiresHeader) request.getHeader(Expires.NAME);
if (expiresHeader == null) { if (expiresHeader == null) {
response = getMessageFactory().createResponse(Response.BAD_REQUEST, request); response = getMessageFactory().createResponse(Response.BAD_REQUEST, request);
getServerTransaction(evt).sendResponse(response); getServerTransaction(evt).sendResponse(response);
return; return;
} }
// 添加Contact头 // 添加Contact头
response.addHeader(request.getHeader(ContactHeader.NAME)); response.addHeader(request.getHeader(ContactHeader.NAME));
// 添加Expires头 // 添加Expires头
response.addHeader(request.getExpires()); response.addHeader(request.getExpires());
// 获取到通信地址等信息 // 获取到通信地址等信息
ViaHeader viaHeader = (ViaHeader) request.getHeader(ViaHeader.NAME); ViaHeader viaHeader = (ViaHeader) request.getHeader(ViaHeader.NAME);
String received = viaHeader.getReceived(); String received = viaHeader.getReceived();
int rPort = viaHeader.getRPort(); int rPort = viaHeader.getRPort();
// 解析本地地址替代 // 解析本地地址替代
if (StringUtils.isEmpty(received) || rPort == -1) { if (StringUtils.isEmpty(received) || rPort == -1) {
received = viaHeader.getHost(); received = viaHeader.getHost();
rPort = viaHeader.getPort(); rPort = viaHeader.getPort();
} }
// //
if (device == null) { if (device == null) {
device = new Device(); device = new Device();
device.setStreamMode("UDP"); device.setStreamMode("UDP");
device.setDeviceId(deviceId); device.setDeviceId(deviceId);
} }
device.setIp(received); device.setIp(received);
device.setPort(rPort); device.setPort(rPort);
device.setHostAddress(received.concat(":").concat(String.valueOf(rPort))); device.setHostAddress(received.concat(":").concat(String.valueOf(rPort)));
// 注销成功 // 注销成功
if (expiresHeader.getExpires() == 0) { if (expiresHeader.getExpires() == 0) {
registerFlag = 2; registerFlag = 2;
} }
// 注册成功 // 注册成功
else { else {
device.setExpires(expiresHeader.getExpires()); device.setExpires(expiresHeader.getExpires());
registerFlag = 1; registerFlag = 1;
// 判断TCP还是UDP // 判断TCP还是UDP
boolean isTcp = false; boolean isTcp = false;
ViaHeader reqViaHeader = (ViaHeader) request.getHeader(ViaHeader.NAME); ViaHeader reqViaHeader = (ViaHeader) request.getHeader(ViaHeader.NAME);
String transport = reqViaHeader.getTransport(); String transport = reqViaHeader.getTransport();
if (transport.equals("TCP")) { if (transport.equals("TCP")) {
isTcp = true; isTcp = true;
}
device.setTransport(isTcp ? "TCP" : "UDP");
} }
device.setTransport(isTcp ? "TCP" : "UDP");
} }
} }
getServerTransaction(evt).sendResponse(response); getServerTransaction(evt).sendResponse(response);
// 注册成功 // 注册成功
// 保存到redis // 保存到redis

1
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
View File

@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.conf.MediaConfig; import com.genersoft.iot.vmp.conf.MediaConfig;
import com.genersoft.iot.vmp.conf.SipConfig;
import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem; import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
import com.genersoft.iot.vmp.storager.IVideoManagerStorager; import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import com.genersoft.iot.vmp.service.IStreamProxyService; import com.genersoft.iot.vmp.service.IStreamProxyService;

6
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerConfig.java
View File

@ -41,7 +41,7 @@ public class ZLMServerConfig {
private String streamIp; private String streamIp;
private long updateTime; private String updateTime;
@JSONField(name = "hls.fileBufSize") @JSONField(name = "hls.fileBufSize")
private String hlsFileBufSize; private String hlsFileBufSize;
@ -732,11 +732,11 @@ public class ZLMServerConfig {
this.shellPhell = shellPhell; this.shellPhell = shellPhell;
} }
public long getUpdateTime() { public String getUpdateTime() {
return updateTime; return updateTime;
} }
public void setUpdateTime(long updateTime) { public void setUpdateTime(String updateTime) {
this.updateTime = updateTime; this.updateTime = updateTime;
} }

2
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
View File

@ -24,7 +24,7 @@ public interface DeviceChannelMapper {
@Update(value = {" <script>" + @Update(value = {" <script>" +
"UPDATE device_channel " + "UPDATE device_channel " +
"SET updateTime=datetime('now','localtime'))" + "SET updateTime=datetime('now','localtime')" +
"<if test=\"name != null\">, name='${name}'</if>" + "<if test=\"name != null\">, name='${name}'</if>" +
"<if test=\"manufacture != null\">, manufacture='${manufacture}'</if>" + "<if test=\"manufacture != null\">, manufacture='${manufacture}'</if>" +
"<if test=\"model != null\">, model='${model}'</if>" + "<if test=\"model != null\">, model='${model}'</if>" +

4
src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
View File

@ -10,6 +10,7 @@ import com.genersoft.iot.vmp.utils.redis.RedisUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
@ -22,6 +23,7 @@ public class RedisCatchStorageImpl implements IRedisCatchStorage {
@Autowired @Autowired
private DeviceChannelMapper deviceChannelMapper; private DeviceChannelMapper deviceChannelMapper;
private SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
/** /**
* 开始播放时将流存入redis * 开始播放时将流存入redis
@ -91,7 +93,7 @@ public class RedisCatchStorageImpl implements IRedisCatchStorage {
*/ */
@Override @Override
public boolean updateMediaInfo(ZLMServerConfig ZLMServerConfig) { public boolean updateMediaInfo(ZLMServerConfig ZLMServerConfig) {
ZLMServerConfig.setUpdateTime(System.currentTimeMillis()); ZLMServerConfig.setUpdateTime(format.format(new Date(System.currentTimeMillis())));
return redis.set(VideoManagerConstants.MEDIA_SERVER_PREFIX, ZLMServerConfig); return redis.set(VideoManagerConstants.MEDIA_SERVER_PREFIX, ZLMServerConfig);
} }