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/auth/DigestServerAuthenticationHelper.java | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 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 234920e..7c319ef 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
@@ -27,8 +27,7 @@
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
-import java.text.DecimalFormat;
-import java.util.Date;
+import java.time.Instant;
import java.util.Random;
import javax.sip.address.URI;
@@ -90,17 +89,12 @@
* @return a generated nonce.
*/
private String generateNonce() {
- // Get the time of day and run MD5 over it.
- Date date = new Date();
- long time = date.getTime();
+ long time = Instant.now().toEpochMilli();
Random rand = new Random();
long pad = rand.nextLong();
- // 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);
}
@@ -129,7 +123,9 @@
*/
public boolean doAuthenticateHashedPassword(Request request, String hashedPassword) {
AuthorizationHeader authHeader = (AuthorizationHeader) request.getHeader(AuthorizationHeader.NAME);
- if ( authHeader == null ) return false;
+ if ( authHeader == null ) {
+ return false;
+ }
String realm = authHeader.getRealm();
String username = authHeader.getUsername();
@@ -176,7 +172,9 @@
*/
public boolean doAuthenticatePlainTextPassword(Request request, String pass) {
AuthorizationHeader authHeader = (AuthorizationHeader) request.getHeader(AuthorizationHeader.NAME);
- if ( authHeader == null ) return false;
+ if ( authHeader == null ) {
+ return false;
+ }
String realm = authHeader.getRealm().trim();
String username = authHeader.getUsername().trim();
@@ -194,12 +192,13 @@
// 瀹㈡埛绔殢鏈烘暟锛岃繖鏄竴涓笉閫忔槑鐨勫瓧绗︿覆鍊硷紝鐢卞鎴风鎻愪緵锛屽苟涓斿鎴风鍜屾湇鍔″櫒閮戒細浣跨敤锛屼互閬垮厤鐢ㄦ槑鏂囨枃鏈��
// 杩欎娇寰楀弻鏂归兘鍙互鏌ラ獙瀵规柟鐨勮韩浠斤紝骞跺娑堟伅鐨勫畬鏁存�ф彁渚涗竴浜涗繚鎶�
- //String cNonce = authHeader.getCNonce();
+ String cnonce = authHeader.getCNonce();
// nonce璁℃暟鍣紝鏄竴涓�16杩涘埗鐨勬暟鍊硷紝琛ㄧず鍚屼竴nonce涓嬪鎴风鍙戦�佸嚭璇锋眰鐨勬暟閲�
int nc = authHeader.getNonceCount();
- String ncStr = new DecimalFormat("00000000").format(nc);
-// String ncStr = new DecimalFormat("00000000").format(Integer.parseInt(nc + "", 16));
+ String ncStr = String.format("%08x", nc).toUpperCase();
+ // String ncStr = new DecimalFormat("00000000").format(nc);
+ // String ncStr = new DecimalFormat("00000000").format(Integer.parseInt(nc + "", 16));
String A1 = username + ":" + realm + ":" + pass;
String A2 = request.getMethod().toUpperCase() + ":" + uri.toString();
@@ -212,14 +211,14 @@
String HA2 = toHexString(mdbytes);
logger.debug("HA1: " + HA1);
logger.debug("HA2: " + HA2);
- String cnonce = authHeader.getCNonce();
+ // String cnonce = authHeader.getCNonce();
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") ) {
+ if (qop != null && qop.equalsIgnoreCase("auth") ) {
if (nc != -1) {
KD += ":" + ncStr;
}
--
Gitblit v1.8.0