From 1af77ab5f7c11a4b3d59c1989b51b9fca29679ce Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 18 十月 2022 22:18:49 +0800
Subject: [PATCH] Merge pull request #645 from IKangXu/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java | 74 +++++++++++-------------------------
1 files changed, 23 insertions(+), 51 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 1c05440..6ca99e4 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
@@ -1,17 +1,14 @@
package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl;
-import com.genersoft.iot.vmp.common.VideoManagerConstants;
import com.genersoft.iot.vmp.conf.SipConfig;
-import com.genersoft.iot.vmp.gb28181.auth.DigestServerAuthenticationHelper;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.WvpSipDate;
-import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
import com.genersoft.iot.vmp.gb28181.transmit.SIPProcessorObserver;
+import com.genersoft.iot.vmp.gb28181.transmit.SIPSender;
import com.genersoft.iot.vmp.gb28181.transmit.event.request.ISIPRequestProcessor;
import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
+import com.genersoft.iot.vmp.gb28181.auth.DigestServerAuthenticationHelper;
import com.genersoft.iot.vmp.service.IDeviceService;
-import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import com.genersoft.iot.vmp.utils.DateUtil;
import gov.nist.javax.sip.RequestEventExt;
import gov.nist.javax.sip.address.AddressImpl;
@@ -23,11 +20,9 @@
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
+import org.springframework.util.ObjectUtils;
-import javax.sip.InvalidArgumentException;
import javax.sip.RequestEvent;
-import javax.sip.ServerTransaction;
import javax.sip.SipException;
import javax.sip.header.*;
import javax.sip.message.Request;
@@ -45,25 +40,19 @@
private final Logger logger = LoggerFactory.getLogger(RegisterRequestProcessor.class);
- public String method = "REGISTER";
+ public final String method = "REGISTER";
@Autowired
private SipConfig sipConfig;
-
- @Autowired
- private IRedisCatchStorage redisCatchStorage;
-
- @Autowired
- private IVideoManagerStorage storager;
-
- @Autowired
- private EventPublisher publisher;
@Autowired
private SIPProcessorObserver sipProcessorObserver;
@Autowired
private IDeviceService deviceService;
+
+ @Autowired
+ private SIPSender sipSender;
@Override
public void afterPropertiesSet() throws Exception {
@@ -86,37 +75,35 @@
ExpiresHeader expiresHeader = (ExpiresHeader) request.getHeader(Expires.NAME);
Response response = null;
boolean passwordCorrect = false;
- // 娉ㄥ唽鏍囧織 0锛氭湭鎼哄甫鎺堟潈澶存垨鑰呭瘑鐮侀敊璇� 1锛氭敞鍐屾垚鍔� 2锛氭敞閿�鎴愬姛
+ // 娉ㄥ唽鏍囧織
boolean registerFlag = false;
FromHeader fromHeader = (FromHeader) request.getHeader(FromHeader.NAME);
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) {
+ if (authHead == null && !ObjectUtils.isEmpty(password)) {
logger.info("[娉ㄥ唽璇锋眰] 鏈惡甯︽巿鏉冨ご 鍥炲401: {}", requestAddress);
response = getMessageFactory().createResponse(Response.UNAUTHORIZED, request);
new DigestServerAuthenticationHelper().generateChallenge(getHeaderFactory(), response, sipConfig.getDomain());
- sendResponse(evt, response);
+ sipSender.transmitRequest(response);
return;
}
// 鏍￠獙瀵嗙爜鏄惁姝ｇ‘
- passwordCorrect = StringUtils.isEmpty(sipConfig.getPassword()) ||
- new DigestServerAuthenticationHelper().doAuthenticatePlainTextPassword(request, sipConfig.getPassword());
- // 鏈惡甯︽巿鏉冨ご鎴栬�呭瘑鐮侀敊璇� 鍥炲401
+ 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);
- sendResponse(evt, response);
+ sipSender.transmitRequest(response);
return;
}
-
- Device device = deviceService.queryDevice(deviceId);
// 鎼哄甫鎺堟潈澶村苟涓斿瘑鐮佹纭�
response = getMessageFactory().createResponse(Response.OK, request);
@@ -129,11 +116,7 @@
if (expiresHeader == null) {
response = getMessageFactory().createResponse(Response.BAD_REQUEST, request);
- ServerTransaction serverTransaction = getServerTransaction(evt);
- serverTransaction.sendResponse(response);
- if (serverTransaction.getDialog() != null) {
- serverTransaction.getDialog().delete();
- }
+ sipSender.transmitRequest(response);
return;
}
// 娣诲姞Contact澶�
@@ -146,7 +129,7 @@
String received = viaHeader.getReceived();
int rPort = viaHeader.getRPort();
// 瑙ｆ瀽鏈湴鍦板潃鏇夸唬
- if (StringUtils.isEmpty(received) || rPort == -1) {
+ if (ObjectUtils.isEmpty(received) || rPort == -1) {
received = viaHeader.getHost();
rPort = viaHeader.getPort();
}
@@ -154,7 +137,10 @@
device = new Device();
device.setStreamMode("UDP");
device.setCharset("GB2312");
+ device.setGeoCoordSys("WGS84");
+ device.setTreeType("CivilCode");
device.setDeviceId(deviceId);
+ device.setOnline(0);
}
device.setIp(received);
device.setPort(rPort);
@@ -169,10 +155,10 @@
// 鍒ゆ柇TCP杩樻槸UDP
ViaHeader reqViaHeader = (ViaHeader) request.getHeader(ViaHeader.NAME);
String transport = reqViaHeader.getTransport();
- device.setTransport("TCP".equals(transport) ? "TCP" : "UDP");
+ device.setTransport("TCP".equalsIgnoreCase(transport) ? "TCP" : "UDP");
}
- sendResponse(evt, response);
+ sipSender.transmitRequest(response);
// 娉ㄥ唽鎴愬姛
// 淇濆瓨鍒皉edis
if (registerFlag) {
@@ -183,22 +169,8 @@
logger.info("[娉ㄩ攢鎴愬姛] deviceId: {}->{}" ,deviceId, requestAddress);
deviceService.offline(deviceId);
}
- } catch (SipException | InvalidArgumentException | NoSuchAlgorithmException | ParseException e) {
+ } catch (SipException | NoSuchAlgorithmException | ParseException e) {
e.printStackTrace();
}
-
}
-
- private void sendResponse(RequestEvent evt, Response response) throws InvalidArgumentException, SipException {
- ServerTransaction serverTransaction = getServerTransaction(evt);
- if (serverTransaction == null) {
- logger.warn("[鍥炲澶辫触]锛歿}", response);
- return;
- }
- serverTransaction.sendResponse(response);
- if (serverTransaction.getDialog() != null) {
- serverTransaction.getDialog().delete();
- }
- }
-
}
--
Gitblit v1.8.0