From d340a37a00c8d5ea2605ca0f40a920efbeb9546f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 17 十一月 2022 11:31:30 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into wvp-28181-2.0-multi-network
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java | 33 ++++++++++++++++-----------------
1 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java
index 99aabcf..6be8c89 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java
@@ -15,13 +15,13 @@
import gov.nist.javax.sip.address.SipUri;
import gov.nist.javax.sip.header.Expires;
import gov.nist.javax.sip.header.SIPDateHeader;
+import gov.nist.javax.sip.message.SIPRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
import javax.sip.RequestEvent;
import javax.sip.SipException;
@@ -72,8 +72,7 @@
RequestEventExt evtExt = (RequestEventExt) evt;
String requestAddress = evtExt.getRemoteIpAddress() + ":" + evtExt.getRemotePort();
logger.info("[娉ㄥ唽璇锋眰] 寮�濮嬪鐞�: {}", requestAddress);
- Request request = evt.getRequest();
- ExpiresHeader expiresHeader = (ExpiresHeader) request.getHeader(Expires.NAME);
+ SIPRequest request = (SIPRequest)evt.getRequest();
Response response = null;
boolean passwordCorrect = false;
// 娉ㄥ唽鏍囧織
@@ -82,30 +81,29 @@
AddressImpl address = (AddressImpl) fromHeader.getAddress();
SipUri uri = (SipUri) address.getURI();
String deviceId = uri.getUser();
-
+ Device device = deviceService.getDevice(deviceId);
+ String password = (device != null && !ObjectUtils.isEmpty(device.getPassword()))? device.getPassword() : sipConfig.getPassword();
AuthorizationHeader authHead = (AuthorizationHeader) request.getHeader(AuthorizationHeader.NAME);
- if (authHead == null && !ObjectUtils.isEmpty(sipConfig.getPassword())) {
- logger.info("[娉ㄥ唽璇锋眰] 鏈惡甯︽巿鏉冨ご 鍥炲401: {}", requestAddress);
+ if (authHead == null && !ObjectUtils.isEmpty(password)) {
+ logger.info("[娉ㄥ唽璇锋眰] 鍥炲401: {}", requestAddress);
response = getMessageFactory().createResponse(Response.UNAUTHORIZED, request);
new DigestServerAuthenticationHelper().generateChallenge(getHeaderFactory(), response, sipConfig.getDomain());
- sipSender.transmitRequest(response);
+ sipSender.transmitRequest(request.getLocalAddress().getHostAddress(), response);
return;
}
// 鏍￠獙瀵嗙爜鏄惁姝ｇ‘
- passwordCorrect = ObjectUtils.isEmpty(sipConfig.getPassword()) ||
- new DigestServerAuthenticationHelper().doAuthenticatePlainTextPassword(request, sipConfig.getPassword());
+ passwordCorrect = ObjectUtils.isEmpty(password) ||
+ new DigestServerAuthenticationHelper().doAuthenticatePlainTextPassword(request, password);
if (!passwordCorrect) {
// 娉ㄥ唽澶辫触
response = getMessageFactory().createResponse(Response.FORBIDDEN, request);
response.setReasonPhrase("wrong password");
logger.info("[娉ㄥ唽璇锋眰] 瀵嗙爜/SIP鏈嶅姟鍣↖D閿欒, 鍥炲403: {}", requestAddress);
- sipSender.transmitRequest(response);
+ sipSender.transmitRequest(request.getLocalAddress().getHostAddress(), response);
return;
}
-
- Device device = deviceService.queryDevice(deviceId);
// 鎼哄甫鎺堟潈澶村苟涓斿瘑鐮佹纭�
response = getMessageFactory().createResponse(Response.OK, request);
@@ -116,9 +114,9 @@
dateHeader.setDate(wvpSipDate);
response.addHeader(dateHeader);
- if (expiresHeader == null) {
+ if (request.getExpires() == null) {
response = getMessageFactory().createResponse(Response.BAD_REQUEST, request);
- sipSender.transmitRequest(response);
+ sipSender.transmitRequest(request.getLocalAddress().getHostAddress(), response);
return;
}
// 娣诲姞Contact澶�
@@ -147,12 +145,13 @@
device.setIp(received);
device.setPort(rPort);
device.setHostAddress(received.concat(":").concat(String.valueOf(rPort)));
- if (expiresHeader.getExpires() == 0) {
+ device.setLocalIp(request.getLocalAddress().getHostAddress());
+ if (request.getExpires().getExpires() == 0) {
// 娉ㄩ攢鎴愬姛
registerFlag = false;
} else {
// 娉ㄥ唽鎴愬姛
- device.setExpires(expiresHeader.getExpires());
+ device.setExpires(request.getExpires().getExpires());
registerFlag = true;
// 鍒ゆ柇TCP杩樻槸UDP
ViaHeader reqViaHeader = (ViaHeader) request.getHeader(ViaHeader.NAME);
@@ -160,7 +159,7 @@
device.setTransport("TCP".equalsIgnoreCase(transport) ? "TCP" : "UDP");
}
- sipSender.transmitRequest(response);
+ sipSender.transmitRequest(request.getLocalAddress().getHostAddress(), response);
// 娉ㄥ唽鎴愬姛
// 淇濆瓨鍒皉edis
if (registerFlag) {
--
Gitblit v1.8.0