更新docker,更新readme

648540858

2021-09-02 77bf85342b9d5a7954c85f05a54e6a46d41f0bf6

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

@@ -2,14 +2,12 @@


import java.security.NoSuchAlgorithmException;

import java.text.ParseException;

import java.text.SimpleDateFormat;

import java.time.LocalDateTime;

import java.util.Calendar;

import java.util.Date;

import java.util.Locale;



import javax.sip.InvalidArgumentException;

import javax.sip.RequestEvent;

import javax.sip.ServerTransaction;

import javax.sip.SipException;

import javax.sip.header.AuthorizationHeader;

import javax.sip.header.ContactHeader;

@@ -22,7 +20,6 @@
import com.genersoft.iot.vmp.gb28181.bean.WvpSipDate;

import gov.nist.javax.sip.RequestEventExt;

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.util.StringUtils;

@@ -82,27 +79,24 @@
         // 校验密码是否正确

         if (authorhead != null) {

            passwordCorrect = new DigestServerAuthenticationHelper().doAuthenticatePlainTextPassword(request,

                  sipConfig.getSipPassword());

                  sipConfig.getPassword());

         }

         if (StringUtils.isEmpty(sipConfig.getSipPassword())){

         if (StringUtils.isEmpty(sipConfig.getPassword())){

            passwordCorrect = true;

         }



         // 未携带授权头或者密码错误 回复401

         if (authorhead == null ) {

				
            if (authorhead == null) {

               logger.info("[{}] 未携带授权头 回复401", requestAddress);

            } else if (!passwordCorrect) {

               logger.info("[{}] 密码错误 回复401", requestAddress);

            }



            logger.info("[{}] 未携带授权头 回复401", requestAddress);

            response = getMessageFactory().createResponse(Response.UNAUTHORIZED, request);

            new DigestServerAuthenticationHelper().generateChallenge(getHeaderFactory(), response, sipConfig.getSipDomain());

            new DigestServerAuthenticationHelper().generateChallenge(getHeaderFactory(), response, sipConfig.getDomain());

         }else {

            if (!passwordCorrect){

               // 注册失败

               response = getMessageFactory().createResponse(Response.FORBIDDEN, request);

               response.setReasonPhrase("wrong password");

               logger.info("[{}] 密码错误 回复403", requestAddress);

            }else {

               // 携带授权头并且密码正确

               response = getMessageFactory().createResponse(Response.OK, request);

@@ -116,7 +110,9 @@
               ExpiresHeader expiresHeader = (ExpiresHeader) request.getHeader(Expires.NAME);

               if (expiresHeader == null) {

                  response = getMessageFactory().createResponse(Response.BAD_REQUEST, request);

                  getServerTransaction(evt).sendResponse(response);

                  ServerTransaction serverTransaction = getServerTransaction(evt);

                  serverTransaction.sendResponse(response);

                  if (serverTransaction.getDialog() != null) serverTransaction.getDialog().delete();

                  return;

               }

               // 添加Contact头

@@ -163,7 +159,9 @@
            }

         }



         getServerTransaction(evt).sendResponse(response);

         ServerTransaction serverTransaction = getServerTransaction(evt);

         serverTransaction.sendResponse(response);

         if (serverTransaction.getDialog() != null) serverTransaction.getDialog().delete();

         // 注册成功

         // 保存到redis

         // 下发catelog查询目录