diff --git a/docker-jans-persistence-loader/templates/jans-auth/jans-auth-config.json b/docker-jans-persistence-loader/templates/jans-auth/jans-auth-config.json index 7be5e935cf2..c6ef08bab9e 100644 --- a/docker-jans-persistence-loader/templates/jans-auth/jans-auth-config.json +++ b/docker-jans-persistence-loader/templates/jans-auth/jans-auth-config.json @@ -366,7 +366,7 @@ "logClientIdOnClientAuthentication": true, "logClientNameOnClientAuthentication": false, "httpLoggingEnabled": false, - "httpLoggingExludePaths": [], + "httpLoggingExcludePaths": [], "externalLoggerConfiguration": "", "authorizationRequestCustomAllowedParameters" : [ { diff --git a/docker-jans-persistence-loader/templates/jans-auth/jans-auth-config.ob.json b/docker-jans-persistence-loader/templates/jans-auth/jans-auth-config.ob.json index 05559f2ecb5..1a9bd24eaa4 100644 --- a/docker-jans-persistence-loader/templates/jans-auth/jans-auth-config.ob.json +++ b/docker-jans-persistence-loader/templates/jans-auth/jans-auth-config.ob.json @@ -288,7 +288,7 @@ "logClientIdOnClientAuthentication": true, "logClientNameOnClientAuthentication": false, "httpLoggingEnabled": false, - "httpLoggingExludePaths": [], + "httpLoggingExcludePaths": [], "externalLoggerConfiguration": "", "authorizationRequestCustomAllowedParameters" : [ { diff --git a/jans-auth-server/model/src/main/java/io/jans/as/model/configuration/AppConfiguration.java b/jans-auth-server/model/src/main/java/io/jans/as/model/configuration/AppConfiguration.java index 7604bbb22f8..6dc797416f2 100644 --- a/jans-auth-server/model/src/main/java/io/jans/as/model/configuration/AppConfiguration.java +++ b/jans-auth-server/model/src/main/java/io/jans/as/model/configuration/AppConfiguration.java @@ -309,7 +309,7 @@ public class AppConfiguration implements Configuration { private List enabledComponents; private Boolean httpLoggingEnabled; // Used in ServletLoggingFilter to enable http request/response logging. - private Set httpLoggingExludePaths; // Used in ServletLoggingFilter to exclude some paths from logger. Paths example: ["/jans-auth/img", "/jans-auth/stylesheet"] + private Set httpLoggingExcludePaths; // Used in ServletLoggingFilter to exclude some paths from logger. Paths example: ["/jans-auth/img", "/jans-auth/stylesheet"] private String externalLoggerConfiguration; // Path to external log4j2 configuration file. This property might be configured from oxTrust: /identity/logviewer/configure public Boolean getRequireRequestObjectEncryption() { @@ -1956,12 +1956,12 @@ public void setHttpLoggingEnabled(Boolean httpLoggingEnabled) { this.httpLoggingEnabled = httpLoggingEnabled; } - public Set getHttpLoggingExludePaths() { - return httpLoggingExludePaths; + public Set getHttpLoggingExcludePaths() { + return httpLoggingExcludePaths; } - public void setHttpLoggingExludePaths(Set httpLoggingExludePaths) { - this.httpLoggingExludePaths = httpLoggingExludePaths; + public void setHttpLoggingExcludePaths(Set httpLoggingExcludePaths) { + this.httpLoggingExcludePaths = httpLoggingExcludePaths; } public String getLoggingLevel() { diff --git a/jans-auth-server/server/src/main/java/io/jans/as/server/audit/debug/ServletLoggingFilter.java b/jans-auth-server/server/src/main/java/io/jans/as/server/audit/debug/ServletLoggingFilter.java index 829fbd1f544..92136e75d75 100644 --- a/jans-auth-server/server/src/main/java/io/jans/as/server/audit/debug/ServletLoggingFilter.java +++ b/jans-auth-server/server/src/main/java/io/jans/as/server/audit/debug/ServletLoggingFilter.java @@ -71,7 +71,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha chain.doFilter(httpRequest, httpResponse); return; } - Set excludedPaths = appConfiguration.getHttpLoggingExludePaths(); + Set excludedPaths = appConfiguration.getHttpLoggingExcludePaths(); if (!CollectionUtils.isEmpty(excludedPaths)) { for (String excludedPath : excludedPaths) { String requestURI = httpRequest.getRequestURI(); diff --git a/jans-cli/cli/jca.yaml b/jans-cli/cli/jca.yaml index c19c21741d7..ebe893997c1 100644 --- a/jans-cli/cli/jca.yaml +++ b/jans-cli/cli/jca.yaml @@ -4764,7 +4764,7 @@ components: httpLoggingEnabled: type: boolean description: Enable/Disable request/response logging filter. - httpLoggingExludePaths: + httpLoggingExcludePaths: type: array description: List of base URI for which request/response logging filter should not record activity. items: @@ -5793,7 +5793,7 @@ components: externalLoggerConfiguration: description: Path to external log4j2 configuration file. type: string - httpLoggingExludePaths: + httpLoggingExcludePaths: description: List of paths to exclude from logger. type: array items: diff --git a/jans-cli/docs/cli/cli-jans-authorization-server.md b/jans-cli/docs/cli/cli-jans-authorization-server.md index e1a226ff648..25db6d749a2 100644 --- a/jans-cli/docs/cli/cli-jans-authorization-server.md +++ b/jans-cli/docs/cli/cli-jans-authorization-server.md @@ -485,7 +485,7 @@ Getting access token for scope https://jans.io/oauth/jans-auth-server/config/pro "cibaEnabled": false, "discoveryCacheLifetimeInMinutes": 60, "httpLoggingEnabled": false, - "httpLoggingExludePaths": null, + "httpLoggingExcludePaths": null, "externalLoggerConfiguration": null, "redirectUrisRegexEnabled": false } diff --git a/jans-cli/docs/cli/cli-logging-configuration.md b/jans-cli/docs/cli/cli-logging-configuration.md index 42aeeb0e5e8..1b83b25e852 100644 --- a/jans-cli/docs/cli/cli-logging-configuration.md +++ b/jans-cli/docs/cli/cli-logging-configuration.md @@ -34,7 +34,7 @@ Getting access token for scope https://jans.io/oauth/config/logging.readonly "disableJdkLogger": true, "enabledOAuthAuditLogging": false, "externalLoggerConfiguration": null, - "httpLoggingExludePaths": null + "httpLoggingExcludePaths": null } ``` @@ -53,7 +53,7 @@ To update logging configuration, get the schema first: "disableJdkLogger": true, "enabledOAuthAuditLogging": false, "externalLoggerConfiguration": null, - "httpLoggingExludePaths": [ + "httpLoggingExcludePaths": [ "/auth/img", "/auth/stylesheet" ] @@ -89,7 +89,7 @@ Server Response: "disableJdkLogger": false, "enabledOAuthAuditLogging": true, "externalLoggerConfiguration": null, - "httpLoggingExludePaths": [ + "httpLoggingExcludePaths": [ "/auth/img", "/auth/stylesheet" ] diff --git a/jans-cli/docs/im/im-jans-authorization-server.md b/jans-cli/docs/im/im-jans-authorization-server.md index 834c7cb5775..63065c65bd4 100644 --- a/jans-cli/docs/im/im-jans-authorization-server.md +++ b/jans-cli/docs/im/im-jans-authorization-server.md @@ -459,7 +459,7 @@ Select 1 to get all the details about Jans authorization server configuration. I "cibaEnabled": false, "discoveryCacheLifetimeInMinutes": 60, "httpLoggingEnabled": false, - "httpLoggingExludePaths": null, + "httpLoggingExcludePaths": null, "externalLoggerConfiguration": null, "redirectUrisRegexEnabled": false } diff --git a/jans-cli/docs/im/im-janssen-logging-configuration.md b/jans-cli/docs/im/im-janssen-logging-configuration.md index 518c60ea080..69f265fd3e5 100644 --- a/jans-cli/docs/im/im-janssen-logging-configuration.md +++ b/jans-cli/docs/im/im-janssen-logging-configuration.md @@ -24,7 +24,7 @@ Getting access token for scope https://jans.io/oauth/config/logging.readonly "disableJdkLogger": true, "enabledOAuthAuditLogging": false, "externalLoggerConfiguration": null, - "httpLoggingExludePaths": null + "httpLoggingExcludePaths": null } ``` To update the current logging configuration select option 2. For example, I have updated `logging level INFO to DEBUG` and enabled `enabledOAuthAuditLogging`. @@ -57,7 +57,7 @@ externalLoggerConfiguration: «List of paths to exclude from logger. Type: array of string separated by _,» Example: /auth/img, /auth/stylesheet -httpLoggingExludePaths: +httpLoggingExcludePaths: Obtained Data: { @@ -67,7 +67,7 @@ Obtained Data: "disableJdkLogger": true, "enabledOAuthAuditLogging": true, "externalLoggerConfiguration": null, - "httpLoggingExludePaths": null + "httpLoggingExcludePaths": null } Continue? y @@ -81,7 +81,7 @@ Please wait while posting data ... "disableJdkLogger": true, "enabledOAuthAuditLogging": true, "externalLoggerConfiguration": null, - "httpLoggingExludePaths": null + "httpLoggingExcludePaths": null } ``` diff --git a/jans-config-api/common/src/main/java/io/jans/configapi/rest/model/Logging.java b/jans-config-api/common/src/main/java/io/jans/configapi/rest/model/Logging.java index 2515ce7bef0..140176eb812 100644 --- a/jans-config-api/common/src/main/java/io/jans/configapi/rest/model/Logging.java +++ b/jans-config-api/common/src/main/java/io/jans/configapi/rest/model/Logging.java @@ -17,7 +17,7 @@ public class Logging { private boolean disableJdkLogger; private boolean enabledOAuthAuditLogging; private String externalLoggerConfiguration; - private Set httpLoggingExludePaths = new HashSet(); + private Set httpLoggingExcludePaths = new HashSet(); public Logging() { } @@ -70,11 +70,11 @@ public void setExternalLoggerConfiguration(String externalLoggerConfiguration) { this.externalLoggerConfiguration = externalLoggerConfiguration; } - public Set getHttpLoggingExludePaths() { - return httpLoggingExludePaths; + public Set getHttpLoggingExcludePaths() { + return httpLoggingExcludePaths; } - public void setHttpLoggingExludePaths(Set httpLoggingExludePaths) { - this.httpLoggingExludePaths = httpLoggingExludePaths; + public void setHttpLoggingExcludePaths(Set httpLoggingExcludePaths) { + this.httpLoggingExcludePaths = httpLoggingExcludePaths; } } diff --git a/jans-config-api/docs/jans-config-api-swagger.yaml b/jans-config-api/docs/jans-config-api-swagger.yaml index c19c21741d7..ebe893997c1 100644 --- a/jans-config-api/docs/jans-config-api-swagger.yaml +++ b/jans-config-api/docs/jans-config-api-swagger.yaml @@ -4764,7 +4764,7 @@ components: httpLoggingEnabled: type: boolean description: Enable/Disable request/response logging filter. - httpLoggingExludePaths: + httpLoggingExcludePaths: type: array description: List of base URI for which request/response logging filter should not record activity. items: @@ -5793,7 +5793,7 @@ components: externalLoggerConfiguration: description: Path to external log4j2 configuration file. type: string - httpLoggingExludePaths: + httpLoggingExcludePaths: description: List of paths to exclude from logger. type: array items: diff --git a/jans-config-api/server/src/main/java/io/jans/configapi/rest/resource/auth/LoggingResource.java b/jans-config-api/server/src/main/java/io/jans/configapi/rest/resource/auth/LoggingResource.java index 153514af4eb..2e2bba70534 100644 --- a/jans-config-api/server/src/main/java/io/jans/configapi/rest/resource/auth/LoggingResource.java +++ b/jans-config-api/server/src/main/java/io/jans/configapi/rest/resource/auth/LoggingResource.java @@ -60,7 +60,7 @@ public Response updateLogConf(@Valid Logging logging) { if (!StringUtils.isBlank(logging.getExternalLoggerConfiguration())) { conf.getDynamic().setExternalLoggerConfiguration(logging.getExternalLoggerConfiguration()); } - conf.getDynamic().setHttpLoggingExludePaths(logging.getHttpLoggingExludePaths()); + conf.getDynamic().setHttpLoggingExcludePaths(logging.getHttpLoggingExcludePaths()); configurationService.merge(conf); @@ -82,7 +82,7 @@ private Logging getLoggingConfiguration() { logging.setEnabledOAuthAuditLogging(appConfiguration.getEnabledOAuthAuditLogging()); } logging.setExternalLoggerConfiguration(appConfiguration.getExternalLoggerConfiguration()); - logging.setHttpLoggingExludePaths(appConfiguration.getHttpLoggingExludePaths()); + logging.setHttpLoggingExcludePaths(appConfiguration.getHttpLoggingExcludePaths()); return logging; } diff --git a/jans-linux-setup/jans_setup/openbanking/templates/jans-auth/jans-auth-config.json b/jans-linux-setup/jans_setup/openbanking/templates/jans-auth/jans-auth-config.json index cd0015f243e..2a2ba2c232e 100644 --- a/jans-linux-setup/jans_setup/openbanking/templates/jans-auth/jans-auth-config.json +++ b/jans-linux-setup/jans_setup/openbanking/templates/jans-auth/jans-auth-config.json @@ -289,7 +289,7 @@ "logClientIdOnClientAuthentication": true, "logClientNameOnClientAuthentication": false, "httpLoggingEnabled": false, - "httpLoggingExludePaths": [], + "httpLoggingExcludePaths": [], "externalLoggerConfiguration": "", "authorizationRequestCustomAllowedParameters" : [ { diff --git a/jans-linux-setup/jans_setup/templates/jans-auth/jans-auth-config.json b/jans-linux-setup/jans_setup/templates/jans-auth/jans-auth-config.json index 0b05e9c10be..48e5c1f80da 100644 --- a/jans-linux-setup/jans_setup/templates/jans-auth/jans-auth-config.json +++ b/jans-linux-setup/jans_setup/templates/jans-auth/jans-auth-config.json @@ -377,7 +377,7 @@ "logClientIdOnClientAuthentication": true, "logClientNameOnClientAuthentication": false, "httpLoggingEnabled": false, - "httpLoggingExludePaths": [], + "httpLoggingExcludePaths": [], "externalLoggerConfiguration": "", "authorizationRequestCustomAllowedParameters" : [ {