Skip to content

Commit e827c76

Browse files
Merge branch 'develop' into maven-upload-fix
2 parents 4087537 + ae12607 commit e827c76

File tree

6 files changed

+66
-7
lines changed

6 files changed

+66
-7
lines changed

.github/workflows/sast.yaml

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
name: Semgrep SAST
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- develop
7+
- test
8+
- staging
9+
- production
10+
- stable
11+
- main
12+
- master
13+
14+
env:
15+
# Fail workflow or not if vulnerabilities found
16+
FAIL_ON_VULNERABILITIES: true
17+
# List of paths (space separated) to ignore
18+
# Supports PATTERNS
19+
# EXCLUDE_PATHS: 'foo bar/baz file.txt dir/*.yml'
20+
EXCLUDE_PATHS: ''
21+
# List of rules (space separated) to ignore
22+
# EXCLUDE_RULES: 'generic.secrets.security.detected-aws-account-id.detected-aws-account-id'
23+
# See https://github.com/semgrep/semgrep-rules for rules registry
24+
EXCLUDE_RULES: ''
25+
26+
jobs:
27+
semgrep:
28+
name: semgrep-oss/scan
29+
runs-on: ubuntu-latest
30+
container:
31+
image: semgrep/semgrep
32+
steps:
33+
- uses: actions/checkout@v4
34+
- name: Scan
35+
shell: bash
36+
run: |
37+
EXCLUDED_PATHS=()
38+
if [[ ! -z $EXCLUDE_PATHS ]]; then
39+
for path in $EXCLUDE_PATHS; do
40+
EXCLUDED_PATHS+=("--exclude $path")
41+
done
42+
fi
43+
44+
EXCLUDED_RULES=()
45+
if [[ ! -z $EXCLUDE_RULES ]]; then
46+
for rule in $EXCLUDE_RULES; do
47+
EXCLUDED_RULES+=("--exclude-rule $rule")
48+
done
49+
fi
50+
51+
if [[ $FAIL_ON_VULNERABILITIES == "true" ]]; then
52+
semgrep scan --config auto ${EXCLUDED_PATHS[@]} ${EXCLUDED_RULES[@]} --error --verbose
53+
elif [[ $FAIL_ON_VULNERABILITIES == "false" ]]; then
54+
semgrep scan --config auto ${EXCLUDED_PATHS[@]} ${EXCLUDED_RULES[@]} --error --verbose || true
55+
else
56+
echo "Bad FAIL_ON_VULNERABILITIES env var value"
57+
exit 1
58+
fi
59+

client/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ plugins {
55
}
66

77
java {
8-
sourceCompatibility = JavaVersion.VERSION_11
9-
targetCompatibility = JavaVersion.VERSION_11
8+
sourceCompatibility = JavaVersion.VERSION_1_8
9+
targetCompatibility = JavaVersion.VERSION_1_8
1010
withSourcesJar()
1111
}
1212

client/src/main/generated/com/regula/documentreader/webclient/model/ExtendedRfidTextField.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public ExtendedRfidTextField withBufText(String bufText) {
121121

122122
/**
123123
* Text field data in UTF8 format. Results of reading different lines of a multiline field are
124-
* separated by “^”
124+
* separated by \"^\"
125125
*
126126
* @return bufText
127127
*/

client/src/main/generated/com/regula/documentreader/webclient/model/ExtendedTextField.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public ExtendedTextField withBufText(String bufText) {
111111

112112
/**
113113
* Text field data in UTF8 format. Results of reading different lines of a multiline field are
114-
* separated by “^”
114+
* separated by \"^\"
115115
*
116116
* @return bufText
117117
*/

client/src/main/generated/com/regula/documentreader/webclient/model/ExtendedVisualTextField.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public ExtendedVisualTextField withBufText(String bufText) {
116116

117117
/**
118118
* Text field data in UTF8 format. Results of reading different lines of a multiline field are
119-
* separated by “^”
119+
* separated by \"^\"
120120
*
121121
* @return bufText
122122
*/

client/src/main/generated/com/regula/documentreader/webclient/model/SecurityFeatureType.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,9 +161,9 @@ public class SecurityFeatureType {
161161
/** Image from barcode vs. photo from camera */
162162
public static final int PORTRAIT_COMPARISON_BARCODE_VS_CAMERA = 49;
163163

164-
/** Digital signature сheck */
164+
/** Digital signature check */
165165
public static final int CHECK_DIGITAL_SIGNATURE = 50;
166166

167-
/** Contact сhip check */
167+
/** Contact chip check */
168168
public static final int CONTACT_CHIP_CLASSIFICATION = 51;
169169
}

0 commit comments

Comments
 (0)