Skip to content

Commit 747ac37

Browse files
refactor/Removed 9 redundant patterns
*Removed 9 redundant patterns** by combining spaced and non-spaced arrow operators into single flexible patterns: - **client_secret**: 3 patterns → 2 patterns (removed the `client_secret->` pattern) - **access_token**: 3 patterns → 2 patterns (removed the `access_token->` pattern) - **refresh_token**: 3 patterns → 2 patterns (removed the `refresh_token->` pattern) - **id_token**: 3 patterns → 2 patterns (removed the `id_token->` pattern) - **token**: 3 patterns → 2 patterns (removed the `token->` pattern) - **password**: 3 patterns → 2 patterns (removed the `password->` pattern) - **api_key**: 3 patterns → 2 patterns (removed the `api_key->` pattern) - **key**: 3 patterns → 2 patterns (removed the `key->` pattern) - **private_key**: 3 patterns → 2 patterns (removed the `private_key->` pattern)
1 parent 6441341 commit 747ac37

File tree

1 file changed

+0
-27
lines changed

1 file changed

+0
-27
lines changed

obp-api/src/main/scala/code/util/SecureLogging.scala

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,6 @@ object SecureLogging {
4040
conditionalPattern("securelogging_mask_client_secret") {
4141
(Pattern.compile("(?i)(client_secret\\s*->\\s*)([^,\\s&\\)]+)"), "$1***")
4242
},
43-
conditionalPattern("securelogging_mask_client_secret") {
44-
(Pattern.compile("(?i)(client_secret->)([^,\\s&\\)]+)"), "$1***")
45-
},
4643

4744
// Authorization / Tokens
4845
conditionalPattern("securelogging_mask_authorization") {
@@ -54,36 +51,24 @@ object SecureLogging {
5451
conditionalPattern("securelogging_mask_access_token") {
5552
(Pattern.compile("(?i)(access_token\\s*->\\s*)([^,\\s&\\)]+)"), "$1***")
5653
},
57-
conditionalPattern("securelogging_mask_access_token") {
58-
(Pattern.compile("(?i)(access_token->)([^,\\s&\\)]+)"), "$1***")
59-
},
6054
conditionalPattern("securelogging_mask_refresh_token") {
6155
(Pattern.compile("(?i)(refresh_token[\"']?\\s*[:=]\\s*[\"']?)([^\"',\\s&]+)"), "$1***")
6256
},
6357
conditionalPattern("securelogging_mask_refresh_token") {
6458
(Pattern.compile("(?i)(refresh_token\\s*->\\s*)([^,\\s&\\)]+)"), "$1***")
6559
},
66-
conditionalPattern("securelogging_mask_refresh_token") {
67-
(Pattern.compile("(?i)(refresh_token->)([^,\\s&\\)]+)"), "$1***")
68-
},
6960
conditionalPattern("securelogging_mask_id_token") {
7061
(Pattern.compile("(?i)(id_token[\"']?\\s*[:=]\\s*[\"']?)([^\"',\\s&]+)"), "$1***")
7162
},
7263
conditionalPattern("securelogging_mask_id_token") {
7364
(Pattern.compile("(?i)(id_token\\s*->\\s*)([^,\\s&\\)]+)"), "$1***")
7465
},
75-
conditionalPattern("securelogging_mask_id_token") {
76-
(Pattern.compile("(?i)(id_token->)([^,\\s&\\)]+)"), "$1***")
77-
},
7866
conditionalPattern("securelogging_mask_token") {
7967
(Pattern.compile("(?i)(token[\"']?\\s*[:=]\\s*[\"']?)([^\"',\\s&]+)"), "$1***")
8068
},
8169
conditionalPattern("securelogging_mask_token") {
8270
(Pattern.compile("(?i)(token\\s*->\\s*)([^,\\s&\\)]+)"), "$1***")
8371
},
84-
conditionalPattern("securelogging_mask_token") {
85-
(Pattern.compile("(?i)(token->)([^,\\s&\\)]+)"), "$1***")
86-
},
8772

8873
// Passwords
8974
conditionalPattern("securelogging_mask_password") {
@@ -92,9 +77,6 @@ object SecureLogging {
9277
conditionalPattern("securelogging_mask_password") {
9378
(Pattern.compile("(?i)(password\\s*->\\s*)([^,\\s&\\)]+)"), "$1***")
9479
},
95-
conditionalPattern("securelogging_mask_password") {
96-
(Pattern.compile("(?i)(password->)([^,\\s&\\)]+)"), "$1***")
97-
},
9880

9981
// API keys
10082
conditionalPattern("securelogging_mask_api_key") {
@@ -103,27 +85,18 @@ object SecureLogging {
10385
conditionalPattern("securelogging_mask_api_key") {
10486
(Pattern.compile("(?i)(api_key\\s*->\\s*)([^,\\s&\\)]+)"), "$1***")
10587
},
106-
conditionalPattern("securelogging_mask_api_key") {
107-
(Pattern.compile("(?i)(api_key->)([^,\\s&\\)]+)"), "$1***")
108-
},
10988
conditionalPattern("securelogging_mask_key") {
11089
(Pattern.compile("(?i)(key[\"']?\\s*[:=]\\s*[\"']?)([^\"',\\s&]+)"), "$1***")
11190
},
11291
conditionalPattern("securelogging_mask_key") {
11392
(Pattern.compile("(?i)(key\\s*->\\s*)([^,\\s&\\)]+)"), "$1***")
11493
},
115-
conditionalPattern("securelogging_mask_key") {
116-
(Pattern.compile("(?i)(key->)([^,\\s&\\)]+)"), "$1***")
117-
},
11894
conditionalPattern("securelogging_mask_private_key") {
11995
(Pattern.compile("(?i)(private_key[\"']?\\s*[:=]\\s*[\"']?)([^\"',\\s&]+)"), "$1***")
12096
},
12197
conditionalPattern("securelogging_mask_private_key") {
12298
(Pattern.compile("(?i)(private_key\\s*->\\s*)([^,\\s&\\)]+)"), "$1***")
12399
},
124-
conditionalPattern("securelogging_mask_private_key") {
125-
(Pattern.compile("(?i)(private_key->)([^,\\s&\\)]+)"), "$1***")
126-
},
127100

128101
// Database
129102
conditionalPattern("securelogging_mask_jdbc") {

0 commit comments

Comments
 (0)