Skip to content

Commit 5547b34

Browse files
NdirituNdiritu
authored
Merge pull request #1704 from microsoftgraph/fix/secrets-scanning
Fix Secrets Scanning Workflow
2 parents ae80da0 + dc80076 commit 5547b34

File tree

5 files changed

+121
-161
lines changed

5 files changed

+121
-161
lines changed

‎.github/workflows/gradle-build.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@ jobs:
1616
java-version: 20
1717
distribution: 'temurin'
1818
cache: gradle
19-
- name: Easy detect-secrets
20-
uses: RobertFischer/[email protected]
19+
- name: Detect secrets
20+
run: |
21+
pip install detect-secrets
22+
git ls-files -z | xargs -0 detect-secrets-hook --baseline .secrets.baseline
2123
- name: Grant execute permission for gradlew
2224
run: chmod +x gradlew
2325
- name: Build with Gradle

‎.secrets.baseline‎

Lines changed: 113 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -1,100 +1,113 @@
1-
{
2-
"version": "1.0.3",
3-
"plugins_used": [
4-
{
5-
"name": "ArtifactoryDetector"
6-
},
7-
{
8-
"name": "AWSKeyDetector"
9-
},
10-
{
11-
"name": "AzureStorageKeyDetector"
12-
},
13-
{
14-
"name": "Base64HighEntropyString",
15-
"limit": 4.5
16-
},
17-
{
18-
"name": "BasicAuthDetector"
19-
},
20-
{
21-
"name": "CloudantDetector"
22-
},
23-
{
24-
"name": "HexHighEntropyString",
25-
"limit": 3.0
26-
},
27-
{
28-
"name": "IbmCloudIamDetector"
29-
},
30-
{
31-
"name": "IbmCosHmacDetector"
32-
},
33-
{
34-
"name": "JwtTokenDetector"
35-
},
36-
{
37-
"name": "KeywordDetector",
38-
"keyword_exclude": ""
39-
},
40-
{
41-
"name": "MailchimpDetector"
42-
},
43-
{
44-
"name": "NpmDetector"
45-
},
46-
{
47-
"name": "PrivateKeyDetector"
48-
},
49-
{
50-
"name": "SlackDetector"
51-
},
52-
{
53-
"name": "SoftlayerDetector"
54-
},
55-
{
56-
"name": "SquareOAuthDetector"
57-
},
58-
{
59-
"name": "StripeDetector"
60-
},
61-
{
62-
"name": "TwilioKeyDetector"
63-
}
64-
],
65-
"filters_used": [
66-
{
67-
"path": "detect_secrets.filters.allowlist.is_line_allowlisted"
68-
},
69-
{
70-
"path": "detect_secrets.filters.common.is_ignored_due_to_verification_policies",
71-
"min_level": 2
72-
},
73-
{
74-
"path": "detect_secrets.filters.heuristic.is_indirect_reference"
75-
},
76-
{
77-
"path": "detect_secrets.filters.heuristic.is_likely_id_string"
78-
},
79-
{
80-
"path": "detect_secrets.filters.heuristic.is_potential_uuid"
81-
},
82-
{
83-
"path": "detect_secrets.filters.heuristic.is_prefixed_with_dollar_sign"
84-
},
85-
{
86-
"path": "detect_secrets.filters.heuristic.is_sequential_string"
87-
},
88-
{
89-
"path": "detect_secrets.filters.heuristic.is_templated_secret"
90-
},
91-
{
92-
"path": "detect_secrets.filters.regex.should_exclude_file",
93-
"pattern": [
94-
"gradle.properties"
95-
]
96-
}
97-
],
98-
"results": {},
99-
"generated_at": "2021-09-09T20:53:20Z"
100-
}
1+
{
2+
"version": "1.5.0",
3+
"plugins_used": [
4+
{
5+
"name": "ArtifactoryDetector"
6+
},
7+
{
8+
"name": "AWSKeyDetector"
9+
},
10+
{
11+
"name": "AzureStorageKeyDetector"
12+
},
13+
{
14+
"name": "Base64HighEntropyString",
15+
"limit": 4.5
16+
},
17+
{
18+
"name": "BasicAuthDetector"
19+
},
20+
{
21+
"name": "CloudantDetector"
22+
},
23+
{
24+
"name": "HexHighEntropyString",
25+
"limit": 3.0
26+
},
27+
{
28+
"name": "IbmCloudIamDetector"
29+
},
30+
{
31+
"name": "IbmCosHmacDetector"
32+
},
33+
{
34+
"name": "JwtTokenDetector"
35+
},
36+
{
37+
"name": "KeywordDetector",
38+
"keyword_exclude": ""
39+
},
40+
{
41+
"name": "MailchimpDetector"
42+
},
43+
{
44+
"name": "NpmDetector"
45+
},
46+
{
47+
"name": "PrivateKeyDetector"
48+
},
49+
{
50+
"name": "SlackDetector"
51+
},
52+
{
53+
"name": "SoftlayerDetector"
54+
},
55+
{
56+
"name": "SquareOAuthDetector"
57+
},
58+
{
59+
"name": "StripeDetector"
60+
},
61+
{
62+
"name": "TwilioKeyDetector"
63+
}
64+
],
65+
"filters_used": [
66+
{
67+
"path": "detect_secrets.filters.allowlist.is_line_allowlisted"
68+
},
69+
{
70+
"path": "detect_secrets.filters.common.is_baseline_file",
71+
"filename": ".secrets.baseline"
72+
},
73+
{
74+
"path": "detect_secrets.filters.common.is_ignored_due_to_verification_policies",
75+
"min_level": 2
76+
},
77+
{
78+
"path": "detect_secrets.filters.heuristic.is_indirect_reference"
79+
},
80+
{
81+
"path": "detect_secrets.filters.heuristic.is_likely_id_string"
82+
},
83+
{
84+
"path": "detect_secrets.filters.heuristic.is_lock_file"
85+
},
86+
{
87+
"path": "detect_secrets.filters.heuristic.is_not_alphanumeric_string"
88+
},
89+
{
90+
"path": "detect_secrets.filters.heuristic.is_potential_uuid"
91+
},
92+
{
93+
"path": "detect_secrets.filters.heuristic.is_prefixed_with_dollar_sign"
94+
},
95+
{
96+
"path": "detect_secrets.filters.heuristic.is_sequential_string"
97+
},
98+
{
99+
"path": "detect_secrets.filters.heuristic.is_swagger_file"
100+
},
101+
{
102+
"path": "detect_secrets.filters.heuristic.is_templated_secret"
103+
},
104+
{
105+
"path": "detect_secrets.filters.regex.should_exclude_file",
106+
"pattern": [
107+
"release-please-config.json"
108+
]
109+
}
110+
],
111+
"results": {},
112+
"generated_at": "2024-08-12T15:21:45Z"
113+
}

‎android/gradle.properties‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,8 @@ mavenArtifactId = microsoft-graph-core
2828
mavenMajorVersion = 3
2929
mavenMinorVersion = 1
3030
mavenPatchVersion = 0
31-
mavenArtifactSuffix =
32-
33-
#These values are used to run functional tests
34-
#If you wish to run the functional tests, edit the gradle.properties
35-
#file in your user directory instead of adding them here.
36-
#ex: C:\Users\username\.gradle\gradle.properties
37-
ClientId="CLIENT_ID"
38-
Username="USERNAME"
39-
Password="PASSWORD"
31+
mavenArtifactSuffix =
32+
4033

4134
#enable mavenCentralPublishingEnabled to publish to maven central
4235
mavenCentralSnapshotArtifactSuffix = -SNAPSHOT

‎gradle.properties‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,6 @@ mavenPatchVersion = 15
3434
# x-release-please-end
3535
mavenArtifactSuffix =
3636

37-
#These values are used to run functional tests
38-
#If you wish to run the functional tests, edit the gradle.properties
39-
#file in your user directory instead of adding them here.
40-
#ex: C:\Users\username\.gradle\gradle.properties
41-
ClientId="CLIENT_ID"
42-
Username="USERNAME"
43-
Password="PASSWORD"
44-
4537
#enable mavenCentralPublishingEnabled to publish to maven central
4638
mavenCentralSnapshotArtifactSuffix = -SNAPSHOT
4739
mavenCentralPublishingEnabled=false

‎src/test/java/com/microsoft/graph/core/content/BatchResponseContentTest.java‎

Lines changed: 2 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -109,27 +109,7 @@ void BatchResponseContent_GetResponseById() {
109109
"\"Content-Type\": \"image/jpeg\"," +
110110
"\"ETag\": \"BEB9D79C\"" +
111111
"}," +
112-
"\"body\": \"iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAYAAADE6YVjAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZ" +
113-
"SBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77" +
114-
"u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM" +
115-
"6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0x" +
116-
"NDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyL" +
117-
"zIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodH" +
118-
"RwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXA" +
119-
"vMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJj" +
120-
"ZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc" +
121-
"3RhbmNlSUQ9InhtcC5paWQ6MEVBMTczNDg3QzA5MTFFNjk3ODM5NjQyRjE2RjA3QTkiIHhtcE1NOkRvY3VtZW" +
122-
"50SUQ9InhtcC5kaWQ6MEVBMTczNDk3QzA5MTFFNjk3ODM5NjQyRjE2RjA3QTkiPiA8eG1wTU06RGVyaXZlZEZ" +
123-
"yb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDowRUExNzM0NjdDMDkxMUU2OTc4Mzk2NDJGMTZGMDdBOSIg" +
124-
"c3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDowRUExNzM0NzdDMDkxMUU2OTc4Mzk2NDJGMTZGMDdBOSIvPiA8L" +
125-
"3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PjjUms" +
126-
"sAAAGASURBVHjatJaxTsMwEIbpIzDA6FaMMPYJkDKzVYU+QFeEGPIKfYU8AETkCYI6wANkZQwIKRNDB1hA0Jr" +
127-
"f0rk6WXZ8BvWkb4kv99vn89kDrfVexBSYgVNwDA7AN+jAK3gEd+AlGMGIBFDgFvzouK3JV/lihQTOwLtOtw9w" +
128-
"IRG5pJn91Tbgqk9kSk7GViADrTD4HCyZ0NQnomi51sb0fUyCMQEbp2WpU67IjfNjwcYyoUDhjJVcZBjYBy40j" +
129-
"4wXgaobWoe8Z6Y80CJBwFpunepIzt2AUgFjtXXshNXjVmMh+K+zzp/CMs0CqeuzrxSRpbOKfdCkiMTS1VBQ41" +
130-
"uxMyQR2qbrXiiwYN3ACh1FDmsdK2Eu4J6Tlo31dYVtCY88h5ELZIJJ+IRMzBHfyJINrigNkt5VsRiub9nXICd" +
131-
"sYyVd2NcVvA3ScE5t2rb5JuEeyZnAhmLt9NK63vX1O5Pe8XaPSuGq1uTrfUgMEp9EJ+CQvr+BJ/AAKvAcCiAR" +
132-
"+bf9CjAAluzmdX4AEIIAAAAASUVORK5CYII=\"" +
112+
"\"body\": \"iVBORw0K\"" +
133113
"}" +
134114
"]}";
135115
ResponseBody body = ResponseBody.create(responseJSON, MediaType.parse("application/json"));
@@ -156,27 +136,7 @@ void BatchResponseContent_GetResponseStreamById() throws IOException {
156136
"\"Content-Type\": \"image/jpeg\"," +
157137
"\"ETag\": \"BEB9D79C\"" +
158138
"}," +
159-
"\"body\": \"iVBORw0KGgoAAAANSUhEUgAAABkAAAAZCAYAAADE6YVjAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZ" +
160-
"SBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77" +
161-
"u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM" +
162-
"6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0x" +
163-
"NDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyL" +
164-
"zIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodH" +
165-
"RwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXA" +
166-
"vMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJj" +
167-
"ZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc" +
168-
"3RhbmNlSUQ9InhtcC5paWQ6MEVBMTczNDg3QzA5MTFFNjk3ODM5NjQyRjE2RjA3QTkiIHhtcE1NOkRvY3VtZW" +
169-
"50SUQ9InhtcC5kaWQ6MEVBMTczNDk3QzA5MTFFNjk3ODM5NjQyRjE2RjA3QTkiPiA8eG1wTU06RGVyaXZlZEZ" +
170-
"yb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDowRUExNzM0NjdDMDkxMUU2OTc4Mzk2NDJGMTZGMDdBOSIg" +
171-
"c3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDowRUExNzM0NzdDMDkxMUU2OTc4Mzk2NDJGMTZGMDdBOSIvPiA8L" +
172-
"3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PjjUms" +
173-
"sAAAGASURBVHjatJaxTsMwEIbpIzDA6FaMMPYJkDKzVYU+QFeEGPIKfYU8AETkCYI6wANkZQwIKRNDB1hA0Jr" +
174-
"f0rk6WXZ8BvWkb4kv99vn89kDrfVexBSYgVNwDA7AN+jAK3gEd+AlGMGIBFDgFvzouK3JV/lihQTOwLtOtw9w" +
175-
"IRG5pJn91Tbgqk9kSk7GViADrTD4HCyZ0NQnomi51sb0fUyCMQEbp2WpU67IjfNjwcYyoUDhjJVcZBjYBy40j" +
176-
"4wXgaobWoe8Z6Y80CJBwFpunepIzt2AUgFjtXXshNXjVmMh+K+zzp/CMs0CqeuzrxSRpbOKfdCkiMTS1VBQ41" +
177-
"uxMyQR2qbrXiiwYN3ACh1FDmsdK2Eu4J6Tlo31dYVtCY88h5ELZIJJ+IRMzBHfyJINrigNkt5VsRiub9nXICd" +
178-
"sYyVd2NcVvA3ScE5t2rb5JuEeyZnAhmLt9NK63vX1O5Pe8XaPSuGq1uTrfUgMEp9EJ+CQvr+BJ/AAKvAcCiAR" +
179-
"+bf9CjAAluzmdX4AEIIAAAAASUVORK5CYII=\"" +
139+
"\"body\": \"iVBORw0KGgoAAAA\"" +
180140
"}" +
181141
"]" +
182142
"}";

0 commit comments

Comments
 (0)