Skip to content

Commit 3185e87

Browse files
TimurSadykovsuztomo
authored andcommitted
[ENTESB-18995] fix: add signature verification to IdTokenVerifier (googleapis#861)
* previously missing signature validation ported from google-auth-library-java * test cases Co-authored-by: Tomo Suzuki <[email protected]> (cherry picked from commit 22419d6)
1 parent 24a2d12 commit 3185e87

File tree

17 files changed

+790
-45
lines changed

17 files changed

+790
-45
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
target/
22
bin/
3+
*.iml
4+
.idea/

google-oauth-client-appengine/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
<configuration>
7878
<signature>
7979
<groupId>org.codehaus.mojo.signature</groupId>
80-
<artifactId>java16</artifactId>
80+
<artifactId>java17</artifactId>
8181
<version>1.0</version>
8282
</signature>
8383
</configuration>

google-oauth-client-java6/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<configuration>
6161
<signature>
6262
<groupId>org.codehaus.mojo.signature</groupId>
63-
<artifactId>java16</artifactId>
63+
<artifactId>java17</artifactId>
6464
<version>1.0</version>
6565
</signature>
6666
</configuration>

google-oauth-client-jetty/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<configuration>
6161
<signature>
6262
<groupId>org.codehaus.mojo.signature</groupId>
63-
<artifactId>java16</artifactId>
63+
<artifactId>java17</artifactId>
6464
<version>1.0</version>
6565
</signature>
6666
</configuration>

google-oauth-client/pom.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@
7272
<dependency>
7373
<groupId>com.google.http-client</groupId>
7474
<artifactId>google-http-client-jackson</artifactId>
75-
<scope>test</scope>
7675
</dependency>
7776
<dependency>
7877
<groupId>junit</groupId>
@@ -82,7 +81,6 @@
8281
<dependency>
8382
<groupId>com.google.guava</groupId>
8483
<artifactId>guava-jdk5</artifactId>
85-
<scope>test</scope>
8684
</dependency>
8785
</dependencies>
8886
</project>
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
/*
2+
* Copyright 2022, Google Inc. All rights reserved.
3+
*
4+
* Redistribution and use in source and binary forms, with or without
5+
* modification, are permitted provided that the following conditions are
6+
* met:
7+
*
8+
* * Redistributions of source code must retain the above copyright
9+
* notice, this list of conditions and the following disclaimer.
10+
* * Redistributions in binary form must reproduce the above
11+
* copyright notice, this list of conditions and the following disclaimer
12+
* in the documentation and/or other materials provided with the
13+
* distribution.
14+
*
15+
* * Neither the name of Google Inc. nor the names of its
16+
* contributors may be used to endorse or promote products derived from
17+
* this software without specific prior written permission.
18+
*
19+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
20+
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
21+
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
22+
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
23+
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
24+
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
25+
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26+
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27+
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28+
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29+
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30+
*/
31+
32+
package com.google.api.client.auth.openidconnect;
33+
34+
class Environment {
35+
public String getVariable(String name) {
36+
return System.getenv(name);
37+
}
38+
}
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
/*
2+
* Copyright 2022, Google Inc. All rights reserved.
3+
*
4+
* Redistribution and use in source and binary forms, with or without
5+
* modification, are permitted provided that the following conditions are
6+
* met:
7+
*
8+
* * Redistributions of source code must retain the above copyright
9+
* notice, this list of conditions and the following disclaimer.
10+
* * Redistributions in binary form must reproduce the above
11+
* copyright notice, this list of conditions and the following disclaimer
12+
* in the documentation and/or other materials provided with the
13+
* distribution.
14+
*
15+
* * Neither the name of Google Inc. nor the names of its
16+
* contributors may be used to endorse or promote products derived from
17+
* this software without specific prior written permission.
18+
*
19+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
20+
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
21+
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
22+
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
23+
* OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
24+
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
25+
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
26+
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
27+
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
28+
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29+
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30+
*/
31+
32+
package com.google.api.client.auth.openidconnect;
33+
34+
import com.google.api.client.http.HttpTransport;
35+
36+
/**
37+
* A base interface for all {@link HttpTransport} factories.
38+
*
39+
* <p>Implementation must provide a public no-arg constructor. Loading of a factory implementation
40+
* is done via {@link java.util.ServiceLoader}.
41+
*/
42+
public interface HttpTransportFactory {
43+
44+
/**
45+
* Creates a {@code HttpTransport} instance.
46+
*
47+
* @return The HttpTransport instance.
48+
*/
49+
HttpTransport create();
50+
}

0 commit comments

Comments
 (0)