Skip to content

Commit ff73489

Browse files
authored
Merge pull request #17 from GovTechSG/development
Patch for CVE-2019-12814
2 parents cadefc0 + d089ec7 commit ff73489

File tree

4 files changed

+57
-34
lines changed

4 files changed

+57
-34
lines changed

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ language: java
33
jdk:
44
- oraclejdk8
55

6+
dist: trusty
7+
68
env:
79
- GRADLE_OPTS="-Dfile.encoding=utf-8"
810

CHANGELOG.md

Lines changed: 51 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,54 @@
11
# Change Log
22

3-
## Added
4-
### V1.0-SNAPSHOT
5-
+ Initial release with HMAC256 and RSA256 signing utility
6-
### V1.0.1-SNAPSHOT
7-
+ Enhancement for Issue #1 - ApiList sorting is not based on key first then value
8-
### V1.1.0-SNAPSHOT
9-
+ Minor refactoring
10-
+ Update interface name so as be intuitive
11-
+ Update corresponding test cases
12-
+ Include Issue/PR templates
13-
+ Include Contribution template
14-
### V1.1.1-SNAPSHOT
15-
+ Minor refactoring
16-
+ Update documentation
17-
+ Update templates
18-
### V1.1.2-SNAPSHOT
19-
+ Minor refactoring
20-
+ Update documentation
21-
### V1.2.0-SNAPSHOT
22-
+ Bug fixes for null value checking
23-
+ Update basestring method to suppport use-case where value of queryparam or form value is empty
24-
+ Update nonce method to generate base64 encoded string value of 32 bytes characters
25-
### V1.3.0-SNAPSHOT
26-
+ Update test-suites framework to cover more use-case scenarios
27-
+ Add Utility to read from PKI Key with PEM format
28-
+ Update README documentation
29-
### V1.3.1-SNAPSHOT
30-
+ Update dependency library for jackson-databind to version 2.9.8
31-
+ Update mvn command to pull centralised unit-test cases from github repository
3+
### V1.3.3-SNAPSHOT
4+
5+
- Set TravisCI build dist to Trusty
6+
- Fixed vulnerablity CVE-2019-12814
7+
328
### V1.3.2-SNAPSHOT
33-
+ Update ApiSigning class to support non-standard http port
9+
10+
- Update ApiSigning class to support non-standard http port
11+
12+
### V1.3.1-SNAPSHOT
13+
14+
- Update dependency library for jackson-databind to version 2.9.8
15+
- Update mvn command to pull centralised unit-test cases from github repository
16+
17+
### V1.3.0-SNAPSHOT
18+
19+
- Update test-suites framework to cover more use-case scenarios
20+
- Add Utility to read from PKI Key with PEM format
21+
- Update README documentation
22+
23+
### V1.2.0-SNAPSHOT
24+
25+
- Bug fixes for null value checking
26+
- Update basestring method to suppport use-case where value of queryparam or form value is empty
27+
- Update nonce method to generate base64 encoded string value of 32 bytes characters
28+
29+
### V1.1.2-SNAPSHOT
30+
31+
- Minor refactoring
32+
- Update documentation
33+
34+
### V1.1.1-SNAPSHOT
35+
36+
- Minor refactoring
37+
- Update documentation
38+
- Update templates
39+
40+
### V1.1.0-SNAPSHOT
41+
42+
- Minor refactoring
43+
- Update interface name so as be intuitive
44+
- Update corresponding test cases
45+
- Include Issue/PR templates
46+
- Include Contribution template
47+
48+
### V1.0.1-SNAPSHOT
49+
50+
- Enhancement for Issue #1 - ApiList sorting is not based on key first then value
51+
52+
### V1.0-SNAPSHOT
53+
54+
- Initial release with HMAC256 and RSA256 signing utility

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
id 'com.github.kt3k.coveralls' version '2.6.3'
55
}
66

7-
version '1.3.2-SNAPSHOT'
7+
version '1.3.3-SNAPSHOT'
88

99
tasks.withType(JavaCompile) {
1010
options.encoding = "UTF-8"
@@ -18,7 +18,7 @@ dependencies {
1818
//compile group: 'org.apache.commons', name: 'commons-collections4', version: '4.1'
1919
compile group: 'commons-lang', name: 'commons-lang', version: '2.4'
2020
compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
21-
compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.8'
21+
compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.9.1'
2222
compile group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1'
2323
compile group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.60'
2424
testCompile group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.25'

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>com.api.util</groupId>
44
<artifactId>ApiSecurity</artifactId>
5-
<version>1.3.2-SNAPSHOT</version>
5+
<version>1.3.3-SNAPSHOT</version>
66
<build>
77
<plugins>
88
<plugin>
@@ -90,7 +90,7 @@
9090
<dependency>
9191
<groupId>com.fasterxml.jackson.core</groupId>
9292
<artifactId>jackson-databind</artifactId>
93-
<version>2.9.9</version>
93+
<version>2.9.9.1</version>
9494
</dependency>
9595
<dependency>
9696
<groupId>com.googlecode.json-simple</groupId>

0 commit comments

Comments
 (0)