From e48fa711a3664bece9b3e58840a75fe7c05bc47c Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期六, 08 五月 2021 17:14:05 +0800
Subject: [PATCH] 添加截图（快照）功能
---
src/main/java/com/genersoft/iot/vmp/gb28181/auth/DigestServerAuthenticationHelper.java | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/auth/DigestServerAuthenticationHelper.java b/src/main/java/com/genersoft/iot/vmp/gb28181/auth/DigestServerAuthenticationHelper.java
index 53282e2..60100e1 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/auth/DigestServerAuthenticationHelper.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/auth/DigestServerAuthenticationHelper.java
@@ -39,6 +39,8 @@
import javax.sip.message.Response;
import gov.nist.core.InternalErrorHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Implements the HTTP digest authentication method server side functionality.
@@ -48,6 +50,8 @@
*/
public class DigestServerAuthenticationHelper {
+
+ private Logger logger = LoggerFactory.getLogger(DigestServerAuthenticationHelper.class);
private MessageDigest messageDigest;
@@ -91,8 +95,10 @@
long time = date.getTime();
Random rand = new Random();
long pad = rand.nextLong();
- String nonceString = (new Long(time)).toString()
- + (new Long(pad)).toString();
+ // String nonceString = (new Long(time)).toString()
+ // + (new Long(pad)).toString();
+ String nonceString = Long.valueOf(time).toString()
+ + Long.valueOf(pad).toString();
byte mdbytes[] = messageDigest.digest(nonceString.getBytes());
// Convert the mdbytes array into a hex string.
return toHexString(mdbytes);
@@ -191,7 +197,7 @@
// 瀹㈡埛绔殢鏈烘暟锛岃繖鏄竴涓笉閫忔槑鐨勫瓧绗︿覆鍊硷紝鐢卞鎴风鎻愪緵锛屽苟涓斿鎴风鍜屾湇鍔″櫒閮戒細浣跨敤锛屼互閬垮厤鐢ㄦ槑鏂囨枃鏈��
// 杩欎娇寰楀弻鏂归兘鍙互鏌ラ獙瀵规柟鐨勮韩浠斤紝骞跺娑堟伅鐨勫畬鏁存�ф彁渚涗竴浜涗繚鎶�
- String cNonce = authHeader.getCNonce();
+ //String cNonce = authHeader.getCNonce();
// nonce璁℃暟鍣紝鏄竴涓�16杩涘埗鐨勬暟鍊硷紝琛ㄧず鍚屼竴nonce涓嬪鎴风鍙戦�佸嚭璇锋眰鐨勬暟閲�
int nc = authHeader.getNonceCount();
@@ -202,18 +208,18 @@
String A2 = request.getMethod().toUpperCase() + ":" + uri.toString();
byte mdbytes[] = messageDigest.digest(A1.getBytes());
String HA1 = toHexString(mdbytes);
- System.out.println("A1: " + A1);
- System.out.println("A2: " + A2);
+ logger.debug("A1: " + A1);
+ logger.debug("A2: " + A2);
mdbytes = messageDigest.digest(A2.getBytes());
String HA2 = toHexString(mdbytes);
- System.out.println("HA1: " + HA1);
- System.out.println("HA2: " + HA2);
+ logger.debug("HA1: " + HA1);
+ logger.debug("HA2: " + HA2);
String cnonce = authHeader.getCNonce();
- System.out.println("nonce: " + nonce);
- System.out.println("nc: " + ncStr);
- System.out.println("cnonce: " + cnonce);
- System.out.println("qop: " + qop);
+ logger.debug("nonce: " + nonce);
+ logger.debug("nc: " + ncStr);
+ logger.debug("cnonce: " + cnonce);
+ logger.debug("qop: " + qop);
String KD = HA1 + ":" + nonce;
if (qop != null && qop.equals("auth") ) {
@@ -226,12 +232,12 @@
KD += ":" + qop;
}
KD += ":" + HA2;
- System.out.println("KD: " + KD);
+ logger.debug("KD: " + KD);
mdbytes = messageDigest.digest(KD.getBytes());
String mdString = toHexString(mdbytes);
- System.out.println("mdString: " + mdString);
+ logger.debug("mdString: " + mdString);
String response = authHeader.getResponse();
- System.out.println("response: " + response);
+ logger.debug("response: " + response);
return mdString.equals(response);
}
--
Gitblit v1.8.0