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 |  285 +++++++++++++++++++++++++-------------------------------
 1 files changed, 127 insertions(+), 158 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 54a5204..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,15 @@
 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.auth.RegisterLogicHandler;
 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.storager.IRedisCatchStorage;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
+import com.genersoft.iot.vmp.gb28181.auth.DigestServerAuthenticationHelper;
+import com.genersoft.iot.vmp.service.IDeviceService;
+import com.genersoft.iot.vmp.utils.DateUtil;
 import gov.nist.javax.sip.RequestEventExt;
 import gov.nist.javax.sip.address.AddressImpl;
 import gov.nist.javax.sip.address.SipUri;
@@ -22,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;
@@ -42,166 +38,139 @@
 @Component
 public class RegisterRequestProcessor extends SIPRequestProcessorParent implements InitializingBean, ISIPRequestProcessor {
 
-	private Logger logger = LoggerFactory.getLogger(RegisterRequestProcessor.class);
+    private final Logger logger = LoggerFactory.getLogger(RegisterRequestProcessor.class);
 
-	public String method = "REGISTER";
+    public final String method = "REGISTER";
 
-	@Autowired
-	private SipConfig sipConfig;
+    @Autowired
+    private SipConfig sipConfig;
 
-	@Autowired
-	private RegisterLogicHandler handler;
+    @Autowired
+    private SIPProcessorObserver sipProcessorObserver;
 
-	@Autowired
-	private IRedisCatchStorage redisCatchStorage;
+    @Autowired
+    private IDeviceService deviceService;
 
-	@Autowired
-	private IVideoManagerStorage storager;
+    @Autowired
+    private SIPSender sipSender;
 
-	@Autowired
-	private EventPublisher publisher;
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        // 娣诲姞娑堟伅澶勭悊鐨勮闃�
+        sipProcessorObserver.addRequestProcessor(method, this);
+    }
 
-	@Autowired
-	private SIPProcessorObserver sipProcessorObserver;
+    /**
+     * 鏀跺埌娉ㄥ唽璇锋眰 澶勭悊
+     *
+     * @param evt
+     */
+    @Override
+    public void process(RequestEvent evt) {
+        try {
+            RequestEventExt evtExt = (RequestEventExt) evt;
+            String requestAddress = evtExt.getRemoteIpAddress() + ":" + evtExt.getRemotePort();
+            logger.info("[娉ㄥ唽璇锋眰] 寮�濮嬪鐞�: {}", requestAddress);
+            Request request = evt.getRequest();
+            ExpiresHeader expiresHeader = (ExpiresHeader) request.getHeader(Expires.NAME);
+            Response response = null;
+            boolean passwordCorrect = false;
+            // 娉ㄥ唽鏍囧織
+            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 && !ObjectUtils.isEmpty(password)) {
+                logger.info("[娉ㄥ唽璇锋眰] 鏈惡甯︽巿鏉冨ご 鍥炲401: {}", requestAddress);
+                response = getMessageFactory().createResponse(Response.UNAUTHORIZED, request);
+                new DigestServerAuthenticationHelper().generateChallenge(getHeaderFactory(), response, sipConfig.getDomain());
+                sipSender.transmitRequest(response);
+                return;
+            }
 
-	@Override
-	public void afterPropertiesSet() throws Exception {
-		// 娣诲姞娑堟伅澶勭悊鐨勮闃�
-		sipProcessorObserver.addRequestProcessor(method, this);
-	}
+            // 鏍¢獙瀵嗙爜鏄惁姝g‘
+            passwordCorrect = ObjectUtils.isEmpty(password) ||
+                    new DigestServerAuthenticationHelper().doAuthenticatePlainTextPassword(request, password);
 
-	/**
-	 * 鏀跺埌娉ㄥ唽璇锋眰 澶勭悊
- 	 * @param evt
-	 */
-	@Override
-	public void process(RequestEvent evt) {
-		try {
-			RequestEventExt evtExt = (RequestEventExt)evt;
-			String requestAddress = evtExt.getRemoteIpAddress() + ":" + evtExt.getRemotePort();
-			logger.info("[{}] 鏀跺埌娉ㄥ唽璇锋眰锛屽紑濮嬪鐞�", requestAddress);
-			Request request = evt.getRequest();
-			ExpiresHeader expiresHeader = (ExpiresHeader) request.getHeader(Expires.NAME);
-			Response response = null; 
-			boolean passwordCorrect = false;
-			// 娉ㄥ唽鏍囧織  0锛氭湭鎼哄甫鎺堟潈澶存垨鑰呭瘑鐮侀敊璇�  1锛氭敞鍐屾垚鍔�   2锛氭敞閿�鎴愬姛
-			int registerFlag = 0;
-			FromHeader fromHeader = (FromHeader) request.getHeader(FromHeader.NAME);
-			AddressImpl address = (AddressImpl) fromHeader.getAddress();
-			SipUri uri = (SipUri) address.getURI();
-			String deviceId = uri.getUser();
-			Device deviceInRedis = redisCatchStorage.getDevice(deviceId);
-			Device device = storager.queryVideoDevice(deviceId);
-			if (deviceInRedis != null && device == null) {
-				// redis 瀛樺湪鑴忔暟鎹�
-				redisCatchStorage.clearCatchByDeviceId(deviceId);
-			}
-			AuthorizationHeader authorhead = (AuthorizationHeader) request.getHeader(AuthorizationHeader.NAME);
-			// 鏍¢獙瀵嗙爜鏄惁姝g‘
-			if (authorhead != null) {
-				passwordCorrect = new DigestServerAuthenticationHelper().doAuthenticatePlainTextPassword(request,
-						sipConfig.getPassword());
-			}
-			if (StringUtils.isEmpty(sipConfig.getPassword())){
-				passwordCorrect = true;
-			}
+            if (!passwordCorrect) {
+                // 娉ㄥ唽澶辫触
+                response = getMessageFactory().createResponse(Response.FORBIDDEN, request);
+                response.setReasonPhrase("wrong password");
+                logger.info("[娉ㄥ唽璇锋眰] 瀵嗙爜/SIP鏈嶅姟鍣↖D閿欒, 鍥炲403: {}", requestAddress);
+                sipSender.transmitRequest(response);
+                return;
+            }
 
-			// 鏈惡甯︽巿鏉冨ご鎴栬�呭瘑鐮侀敊璇� 鍥炲401
-			if (authorhead == null ) {
+            // 鎼哄甫鎺堟潈澶村苟涓斿瘑鐮佹纭�
+            response = getMessageFactory().createResponse(Response.OK, request);
+            // 娣诲姞date澶�
+            SIPDateHeader dateHeader = new SIPDateHeader();
+            // 浣跨敤鑷繁淇敼鐨�
+            WvpSipDate wvpSipDate = new WvpSipDate(Calendar.getInstance(Locale.ENGLISH).getTimeInMillis());
+            dateHeader.setDate(wvpSipDate);
+            response.addHeader(dateHeader);
 
-				logger.info("[{}] 鏈惡甯︽巿鏉冨ご 鍥炲401", requestAddress);
-				response = getMessageFactory().createResponse(Response.UNAUTHORIZED, request);
-				new DigestServerAuthenticationHelper().generateChallenge(getHeaderFactory(), response, sipConfig.getDomain());
-			}else {
-				if (!passwordCorrect){
-					// 娉ㄥ唽澶辫触
-					response = getMessageFactory().createResponse(Response.FORBIDDEN, request);
-					response.setReasonPhrase("wrong password");
-					logger.info("[{}] 瀵嗙爜/SIP鏈嶅姟鍣↖D閿欒, 鍥炲403", requestAddress);
-				}else {
-					// 鎼哄甫鎺堟潈澶村苟涓斿瘑鐮佹纭�
-					response = getMessageFactory().createResponse(Response.OK, request);
-					// 娣诲姞date澶�
-					SIPDateHeader dateHeader = new SIPDateHeader();
-					// 浣跨敤鑷繁淇敼鐨�
-					WvpSipDate wvpSipDate = new WvpSipDate(Calendar.getInstance(Locale.ENGLISH).getTimeInMillis());
-					dateHeader.setDate(wvpSipDate);
-					response.addHeader(dateHeader);
+            if (expiresHeader == null) {
+                response = getMessageFactory().createResponse(Response.BAD_REQUEST, request);
+                sipSender.transmitRequest(response);
+                return;
+            }
+            // 娣诲姞Contact澶�
+            response.addHeader(request.getHeader(ContactHeader.NAME));
+            // 娣诲姞Expires澶�
+            response.addHeader(request.getExpires());
 
+            // 鑾峰彇鍒伴�氫俊鍦板潃绛変俊鎭�
+            ViaHeader viaHeader = (ViaHeader) request.getHeader(ViaHeader.NAME);
+            String received = viaHeader.getReceived();
+            int rPort = viaHeader.getRPort();
+            // 瑙f瀽鏈湴鍦板潃鏇夸唬
+            if (ObjectUtils.isEmpty(received) || rPort == -1) {
+                received = viaHeader.getHost();
+                rPort = viaHeader.getPort();
+            }
+            if (device == null) {
+                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);
+            device.setHostAddress(received.concat(":").concat(String.valueOf(rPort)));
+            if (expiresHeader.getExpires() == 0) {
+                // 娉ㄩ攢鎴愬姛
+                registerFlag = false;
+            } else {
+                // 娉ㄥ唽鎴愬姛
+                device.setExpires(expiresHeader.getExpires());
+                registerFlag = true;
+                // 鍒ゆ柇TCP杩樻槸UDP
+                ViaHeader reqViaHeader = (ViaHeader) request.getHeader(ViaHeader.NAME);
+                String transport = reqViaHeader.getTransport();
+                device.setTransport("TCP".equalsIgnoreCase(transport) ? "TCP" : "UDP");
+            }
 
-					if (expiresHeader == null) {
-						response = getMessageFactory().createResponse(Response.BAD_REQUEST, request);
-						ServerTransaction serverTransaction = getServerTransaction(evt);
-						serverTransaction.sendResponse(response);
-						if (serverTransaction.getDialog() != null) serverTransaction.getDialog().delete();
-						return;
-					}
-					// 娣诲姞Contact澶�
-					response.addHeader(request.getHeader(ContactHeader.NAME));
-					// 娣诲姞Expires澶�
-					response.addHeader(request.getExpires());
-
-					// 鑾峰彇鍒伴�氫俊鍦板潃绛変俊鎭�
-					ViaHeader viaHeader = (ViaHeader) request.getHeader(ViaHeader.NAME);
-					String received = viaHeader.getReceived();
-					int rPort = viaHeader.getRPort();
-					// 瑙f瀽鏈湴鍦板潃鏇夸唬
-					if (StringUtils.isEmpty(received) || rPort == -1) {
-						received = viaHeader.getHost();
-						rPort = viaHeader.getPort();
-					}
-					//
-
-					if (device == null) {
-						device = new Device();
-						device.setStreamMode("UDP");
-						device.setCharset("GB2312");
-						device.setDeviceId(deviceId);
-						device.setFirsRegister(true);
-					}else {
-						if (device.getOnline() == 0) {
-							device.setFirsRegister(true);
-						}
-					}
-					device.setIp(received);
-					device.setPort(rPort);
-					device.setHostAddress(received.concat(":").concat(String.valueOf(rPort)));
-					// 娉ㄩ攢鎴愬姛
-					if (expiresHeader.getExpires() == 0) {
-						registerFlag = 2;
-					}
-					// 娉ㄥ唽鎴愬姛
-					else {
-						device.setExpires(expiresHeader.getExpires());
-						registerFlag = 1;
-						// 鍒ゆ柇TCP杩樻槸UDP
-						boolean isTcp = false;
-						ViaHeader reqViaHeader = (ViaHeader) request.getHeader(ViaHeader.NAME);
-						String transport = reqViaHeader.getTransport();
-						if (transport.equals("TCP")) {
-							isTcp = true;
-						}
-						device.setTransport(isTcp ? "TCP" : "UDP");
-					}
-				}
-			}
-
-			ServerTransaction serverTransaction = getServerTransaction(evt);
-			serverTransaction.sendResponse(response);
-			if (serverTransaction.getDialog() != null) serverTransaction.getDialog().delete();
-			// 娉ㄥ唽鎴愬姛
-			// 淇濆瓨鍒皉edis
-			if (registerFlag == 1 ) {
-				logger.info("[{}] 娉ㄥ唽鎴愬姛! deviceId:" + device.getDeviceId(), requestAddress);
-				publisher.onlineEventPublish(device, VideoManagerConstants.EVENT_ONLINE_REGISTER, expiresHeader.getExpires());
-			} else if (registerFlag == 2) {
-				logger.info("[{}] 娉ㄩ攢鎴愬姛! deviceId:" + device.getDeviceId(), requestAddress);
-				publisher.outlineEventPublish(device.getDeviceId(), VideoManagerConstants.EVENT_OUTLINE_UNREGISTER);
-			}
-		} catch (SipException | InvalidArgumentException | NoSuchAlgorithmException | ParseException e) {
-			e.printStackTrace();
-		}
-		
-	}
-
+            sipSender.transmitRequest(response);
+            // 娉ㄥ唽鎴愬姛
+            // 淇濆瓨鍒皉edis
+            if (registerFlag) {
+                logger.info("[娉ㄥ唽鎴愬姛] deviceId: {}->{}",  deviceId, requestAddress);
+                device.setRegisterTime(DateUtil.getNow());
+                deviceService.online(device);
+            } else {
+                logger.info("[娉ㄩ攢鎴愬姛] deviceId: {}->{}" ,deviceId, requestAddress);
+                deviceService.offline(deviceId);
+            }
+        } catch (SipException | NoSuchAlgorithmException | ParseException e) {
+            e.printStackTrace();
+        }
+    }
 }

--
Gitblit v1.8.0