فهرست منبع

Merge pull request #249 from pwm-project/header-sensitivity-npe-check

NullPointerException Fix
Jason 7 سال پیش
والد
کامیت
f1381992cd
1فایلهای تغییر یافته به همراه12 افزوده شده و 5 حذف شده
  1. 12 5
      server/src/main/java/password/pwm/http/client/PwmHttpClient.java

+ 12 - 5
server/src/main/java/password/pwm/http/client/PwmHttpClient.java

@@ -181,12 +181,19 @@ public class PwmHttpClient {
         msg.append("\n");
         msg.append("\n");
         for (final Map.Entry<String, String> headerEntry : headers.entrySet()) {
         for (final Map.Entry<String, String> headerEntry : headers.entrySet()) {
             final HttpHeader httpHeader = HttpHeader.forHttpHeader(headerEntry.getKey());
             final HttpHeader httpHeader = HttpHeader.forHttpHeader(headerEntry.getKey());
-            final boolean sensitive = httpHeader != null && httpHeader.isSensitive();
-            msg.append("  header: ").append( headerEntry.getValue() ).append("=");
-            if (sensitive) {
-                msg.append(PwmConstants.LOG_REMOVED_VALUE_REPLACEMENT);
+            if (httpHeader != null) {
+                final boolean sensitive = httpHeader.isSensitive();
+                msg.append("  header: ").append( httpHeader.getHttpName() ).append("=");
+
+                if (sensitive) {
+                    msg.append(PwmConstants.LOG_REMOVED_VALUE_REPLACEMENT);
+                } else {
+                    msg.append(headerEntry.getValue());
+                }
             } else {
             } else {
-                msg.append(headerEntry.getValue());
+                // We encountered a header name that doesn't have a corresponding enum in HttpHeader,
+                // so we can't check the sensitive flag.
+                msg.append("  header: ").append(headerEntry.getKey()).append("=").append(headerEntry.getValue());
             }
             }
             msg.append("\n");
             msg.append("\n");
         }
         }