From d178c283179aedc9c3b019af1fecfcb181d9077b Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期五, 25 十二月 2020 15:05:55 +0800
Subject: [PATCH] 修复空指针

---
 src/main/java/com/genersoft/iot/vmp/gb28181/auth/DigestServerAuthenticationHelper.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 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 54e0334..16ed56a 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
@@ -105,11 +105,11 @@
             proxyAuthenticate.setParameter("realm", realm);
             proxyAuthenticate.setParameter("nonce", generateNonce());
 
-//            proxyAuthenticate.setParameter("opaque", "");
-//            proxyAuthenticate.setParameter("stale", "FALSE");
-//            proxyAuthenticate.setParameter("algorithm", DEFAULT_ALGORITHM);
+            proxyAuthenticate.setParameter("opaque", "");
+            proxyAuthenticate.setParameter("stale", "FALSE");
+            proxyAuthenticate.setParameter("algorithm", DEFAULT_ALGORITHM);
 
-            proxyAuthenticate.setParameter("qop", "auth");
+//            proxyAuthenticate.setParameter("qop", "auth");
             response.setHeader(proxyAuthenticate);
         } catch (Exception ex) {
             InternalErrorHandler.handleException(ex);
@@ -187,11 +187,11 @@
            return false;
         }
         // qop 淇濇姢璐ㄩ噺 鍖呭惈auth锛堥粯璁ょ殑锛夊拰auth-int锛堝鍔犱簡鎶ユ枃瀹屾暣鎬ф娴嬶級涓ょ绛栫暐
-        String qop = authHeader.getQop().trim();
+        String qop = authHeader.getQop();
 
         // 瀹㈡埛绔殢鏈烘暟锛岃繖鏄竴涓笉閫忔槑鐨勫瓧绗︿覆鍊硷紝鐢卞鎴风鎻愪緵锛屽苟涓斿鎴风鍜屾湇鍔″櫒閮戒細浣跨敤锛屼互閬垮厤鐢ㄦ槑鏂囨枃鏈��
         // 杩欎娇寰楀弻鏂归兘鍙互鏌ラ獙瀵规柟鐨勮韩浠斤紝骞跺娑堟伅鐨勫畬鏁存�ф彁渚涗竴浜涗繚鎶�
-        String cNonce = authHeader.getCNonce().trim();
+        String cNonce = authHeader.getCNonce();
 
         // nonce璁℃暟鍣紝鏄竴涓�16杩涘埗鐨勬暟鍊硷紝琛ㄧず鍚屼竴nonce涓嬪鎴风鍙戦�佸嚭璇锋眰鐨勬暟閲�
         int nc = authHeader.getNonceCount();

--
Gitblit v1.8.0