Skip to content

Commit 4b946d4

Browse files
authored
[To dev/1.3] Remove OpenID authorizer and related dependencies (#17406)
* Remove OpenIdAuthorizer and OpenID authentication dependencies (#17320) * Remove OpenID authorizer and configuration dependencies * Remove stale OpenID dependencies from SBOM metadata * fix * fix
1 parent b2a2462 commit 4b946d4

10 files changed

Lines changed: 2 additions & 495 deletions

File tree

LICENSE-binary

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -220,28 +220,21 @@ commons-codec:commons-codec:1.16.1
220220
org.apache.commons:commons-collections4:4.4
221221
commons-io:commons-io:2.14.0
222222
org.apache.commons:commons-lang3:3.18.0
223-
com.nimbusds:content-type:2.2
224223
com.google.code.gson:gson:2.13.1
225224
com.google.guava.guava:32.1.2-jre
226225
com.fasterxml.jackson.core:jackson-annotations:2.16.2
227226
com.fasterxml.jackson.core:jackson-core:2.16.2
228227
com.fasterxml.jackson.core:jackson-databind:2.16.2
229228
jakarta.inject:jakarta.inject:2.6.1
230229
at.yawk.lz4:lz4-java:1.10.0
231-
com.github.stephenc.jcip:jcip-annotations:1.0-1
232230
com.github.ben-manes.caffeine:caffeine:2.9.3
233231
org.eclipse.jetty:jetty-http:9.4.58.v20250814
234232
org.eclipse.jetty:jetty-io:9.4.58.v20250814
235233
org.eclipse.jetty:jetty-security:9.4.58.v20250814
236234
org.eclipse.jetty:jetty-server:9.4.58.v20250814
237235
org.eclipse.jetty:jetty-servlet:9.4.58.v20250814
238236
org.eclipse.jetty:jetty-util:9.4.58.v20250814
239-
io.jsonwebtoken:jjwt-api:0.12.7
240-
io.jsonwebtoken:jjwt-impl:0.12.7
241-
io.jsonwebtoken:jjwt-jackson:0.12.7
242-
net.minidev:json-smart:2.5.2
243237
com.google.code.findbugs:jsr305:3.0.2
244-
com.nimbusds:lang-tag:1.7
245238
com.librato.metrics:librato-java:2.1.0
246239
org.apache.thrift:libthrift:0.14.1
247240
io.dropwizard.metrics:metrics-core:4.2.19
@@ -259,14 +252,11 @@ io.netty:netty-transport:4.1.126.Final
259252
io.netty:netty-transport-native-epoll:4.1.126.Final:linux-aarch_64
260253
io.netty:netty-transport-native-epoll:4.1.126.Final:linux-x86_64
261254
io.netty:netty-transport-native-unix-common:4.1.126.Final
262-
com.nimbusds:nimbus-jose-jwt:9.37.4
263-
com.nimbusds:oauth2-oidc-sdk:10.15
264255
org.osgi:org.osgi.core:7.0.0
265256
org.osgi:osgi.cmpn:7.0.0
266257
org.ops4j.pax.jdbc:pax-jdbc-common:1.5.6
267258
org.xerial.snappy:snappy-java:1.1.10.5
268259
io.airlift.airline:0.9
269-
net.minidev:accessors-smart:2.5.0
270260

271261

272262
BSD 3-Clause

iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/persistence/AuthorInfo.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.apache.iotdb.commons.auth.AuthException;
2424
import org.apache.iotdb.commons.auth.authorizer.BasicAuthorizer;
2525
import org.apache.iotdb.commons.auth.authorizer.IAuthorizer;
26-
import org.apache.iotdb.commons.auth.authorizer.OpenIdAuthorizer;
2726
import org.apache.iotdb.commons.auth.entity.PathPrivilege;
2827
import org.apache.iotdb.commons.auth.entity.PriPrivilegeType;
2928
import org.apache.iotdb.commons.auth.entity.Role;
@@ -96,14 +95,7 @@ public TPermissionInfoResp login(String username, String password) {
9695
status = authorizer.login(username, password);
9796
if (status) {
9897
// Bring this user's permission information back to the datanode for caching
99-
if (authorizer instanceof OpenIdAuthorizer) {
100-
username = ((OpenIdAuthorizer) authorizer).getIoTDBUserName(username);
101-
result = getUserPermissionInfo(username);
102-
result.getUserInfo().setIsOpenIdUser(true);
103-
} else {
104-
result = getUserPermissionInfo(username);
105-
}
106-
98+
result = getUserPermissionInfo(username);
10799
result.setStatus(RpcUtils.getStatus(TSStatusCode.SUCCESS_STATUS, "Login successfully"));
108100
} else {
109101
result = AuthUtils.generateEmptyPermissionInfoResp();

iotdb-core/datanode/pom.xml

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -332,23 +332,6 @@
332332
<artifactId>mockito-core</artifactId>
333333
<scope>test</scope>
334334
</dependency>
335-
<!-- Possibly these need to move into the compile or provided scope -->
336-
<dependency>
337-
<groupId>io.jsonwebtoken</groupId>
338-
<artifactId>jjwt-impl</artifactId>
339-
<scope>test</scope>
340-
</dependency>
341-
<!-- Possibly these need to move into the compile or provided scope -->
342-
<dependency>
343-
<groupId>io.jsonwebtoken</groupId>
344-
<artifactId>jjwt-jackson</artifactId>
345-
<scope>test</scope>
346-
</dependency>
347-
<dependency>
348-
<groupId>net.minidev</groupId>
349-
<artifactId>json-smart</artifactId>
350-
<scope>test</scope>
351-
</dependency>
352335
<dependency>
353336
<groupId>org.apache.httpcomponents</groupId>
354337
<artifactId>httpcore</artifactId>
@@ -359,11 +342,6 @@
359342
<artifactId>ratis-thirdparty-misc</artifactId>
360343
<scope>runtime</scope>
361344
</dependency>
362-
<dependency>
363-
<groupId>com.nimbusds</groupId>
364-
<artifactId>oauth2-oidc-sdk</artifactId>
365-
<scope>test</scope>
366-
</dependency>
367345
<dependency>
368346
<groupId>org.apache.httpcomponents</groupId>
369347
<artifactId>httpclient</artifactId>
@@ -554,9 +532,6 @@
554532
<ignoredDependency>org.apache.iotdb:isession</ignoredDependency>
555533
</ignoredDependencies>
556534
<usedDependencies>
557-
<!-- These are used at runtime in tests -->
558-
<usedDependency>io.jsonwebtoken:jjwt-impl</usedDependency>
559-
<usedDependency>io.jsonwebtoken:jjwt-jackson</usedDependency>
560535
<!-- This dependency is required at runtime, when enabling the rest service -->
561536
<usedDependency>org.glassfish.jersey.inject:jersey-hk2</usedDependency>
562537
</usedDependencies>

iotdb-core/datanode/src/test/java/org/apache/iotdb/db/auth/authorizer/OpenIdAuthorizerTest.java

Lines changed: 0 additions & 112 deletions
This file was deleted.

iotdb-core/node-commons/pom.xml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -136,26 +136,10 @@
136136
<groupId>com.google.code.findbugs</groupId>
137137
<artifactId>jsr305</artifactId>
138138
</dependency>
139-
<dependency>
140-
<groupId>net.minidev</groupId>
141-
<artifactId>json-smart</artifactId>
142-
</dependency>
143-
<dependency>
144-
<groupId>com.nimbusds</groupId>
145-
<artifactId>nimbus-jose-jwt</artifactId>
146-
</dependency>
147139
<dependency>
148140
<groupId>cglib</groupId>
149141
<artifactId>cglib</artifactId>
150142
</dependency>
151-
<dependency>
152-
<groupId>io.jsonwebtoken</groupId>
153-
<artifactId>jjwt-api</artifactId>
154-
</dependency>
155-
<dependency>
156-
<groupId>com.nimbusds</groupId>
157-
<artifactId>oauth2-oidc-sdk</artifactId>
158-
</dependency>
159143
<dependency>
160144
<groupId>commons-codec</groupId>
161145
<artifactId>commons-codec</artifactId>

iotdb-core/node-commons/src/assembly/resources/conf/iotdb-system.properties.template

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1653,14 +1653,9 @@ compressor=LZ4
16531653
####################
16541654

16551655
# which class to serve for authorization. By default, it is LocalFileAuthorizer.
1656-
# Another choice is org.apache.iotdb.commons.auth.authorizer.OpenIdAuthorizer
16571656
# effectiveMode: restart
16581657
authorizer_provider_class=org.apache.iotdb.commons.auth.authorizer.LocalFileAuthorizer
16591658

1660-
# If OpenIdAuthorizer is enabled, then openID_url must be set.
1661-
# effectiveMode: restart
1662-
openID_url=
1663-
16641659
# encryption provider class
16651660
# effectiveMode: first_start
16661661
iotdb_server_encrypt_decrypt_provider=org.apache.iotdb.commons.security.encrypt.MessageDigestEncrypt

0 commit comments

Comments
 (0)