Skip to content

Commit 8898e15

Browse files
morningmanclaude
andcommitted
[P3b-T01] commit 2: relocate fe-common security.authentication.* (13 classes) to fe-kerberos
Relocate the Hadoop authentication mechanism from fe-common package org.apache.doris.common.security.authentication to the neutral leaf module fe-kerberos (org.apache.doris.kerberos), making fe-kerberos the single source of truth (D-017 / P3b commit 2 of 3). Root: the auth machinery lived in fe-common, so connectors that cannot depend on fe-common were cut off from it, and it was duplicated by a fe-kerberos facts slice (AuthType). This collapses the fe-common copy into fe-kerberos. Moved (git mv, history-preserving, package line changed): AuthenticationConfig, ExecutionAuthenticator, HadoopAuthenticator, HadoopExecutionAuthenticator, HadoopKerberosAuthenticator, HadoopSimpleAuthenticator, ImpersonatingHadoopAuthenticator, KerberosAuthenticationConfig, KerberosTicketUtils, PreExecutionAuthenticator, PreExecutionAuthenticatorCache, SimpleAuthenticationConfig (+ moved tests AuthenticationTest, KerberosTicketUtilsTest). AuthType merge: the fe-common AuthType (mutable getCode/setCode/setDesc - all dead, zero callers) is folded into the existing immutable fe-kerberos AuthType; added isSupportedAuthType(String) (sole caller HiveTable), kept getDesc/fromString. fe-common AuthType deleted. Retargeted 41 consumer imports (24 fe-core main + 14 fe-core test + 3 be-java-extensions JNI scanners) common.security.authentication.* -> kerberos.* (import-line only, no logic change - incl. the otherwise-forbidden datasource.property.{storage,metastore} packages under the D-017 import-only exception), with import blocks re-sorted to satisfy CustomImportOrder. pom: fe-kerberos gains hadoop-common(provided)+guava+commons-lang3+lombok+ log4j-api (mirroring fe-common; leaf invariant intact - zero FE module deps); fe-common gains a compile edge to fe-kerberos (re-provides the relocated classes transitively to fe-core et al.); java-common gains an explicit fe-kerberos edge for the BE-java scanner plugins. Leaf invariant confirmed: none of the 13 classes import any non-kerberos doris type (recon wf_d5566c5f-7b1, adversarially verified); build order already correct (fe-kerberos before fe-common). Verify: fe-kerberos 11/0 (incl. moved AuthenticationTest + KerberosTicketUtilsTest); fe-core + java-common + 3 scanners test-compile BUILD SUCCESS; checkstyle 0; connector import-gate exit 0; whole-repo grep common.security.authentication = 0. docker kerberos e2e NOT run (the real gate; lands after commit 3 unifies the two HadoopAuthenticator interfaces + deletes the fe-filesystem-hdfs copies). Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]> Claude-Session: https://claude.ai/code/session_011mTrPcvMZtFjsxWJM5TRnG
1 parent 4a740e1 commit 8898e15

60 files changed

Lines changed: 127 additions & 136 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎fe/be-java-extensions/hadoop-hudi-scanner/src/main/java/org/apache/doris/hudi/HadoopHudiJniScanner.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
import org.apache.doris.common.classloader.ThreadClassLoaderContext;
2121
import org.apache.doris.common.jni.JniScanner;
2222
import org.apache.doris.common.jni.vec.ColumnType;
23-
import org.apache.doris.common.security.authentication.PreExecutionAuthenticator;
24-
import org.apache.doris.common.security.authentication.PreExecutionAuthenticatorCache;
23+
import org.apache.doris.kerberos.PreExecutionAuthenticator;
24+
import org.apache.doris.kerberos.PreExecutionAuthenticatorCache;
2525

2626
import com.google.common.base.Joiner;
2727
import com.google.common.base.Preconditions;

‎fe/be-java-extensions/iceberg-metadata-scanner/src/main/java/org/apache/doris/iceberg/IcebergSysTableJniScanner.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import org.apache.doris.common.jni.JniScanner;
2222
import org.apache.doris.common.jni.vec.ColumnType;
2323
import org.apache.doris.common.jni.vec.ColumnValue;
24-
import org.apache.doris.common.security.authentication.PreExecutionAuthenticator;
25-
import org.apache.doris.common.security.authentication.PreExecutionAuthenticatorCache;
24+
import org.apache.doris.kerberos.PreExecutionAuthenticator;
25+
import org.apache.doris.kerberos.PreExecutionAuthenticatorCache;
2626

2727
import com.google.common.base.Preconditions;
2828
import org.apache.iceberg.FileScanTask;

‎fe/be-java-extensions/java-common/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ under the License.
3434
</properties>
3535

3636
<dependencies>
37+
<dependency>
38+
<groupId>org.apache.doris</groupId>
39+
<artifactId>fe-kerberos</artifactId>
40+
<version>${project.version}</version>
41+
</dependency>
3742
<dependency>
3843
<groupId>org.apache.doris</groupId>
3944
<artifactId>fe-common</artifactId>

‎fe/be-java-extensions/paimon-scanner/src/main/java/org/apache/doris/paimon/PaimonJniScanner.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
import org.apache.doris.common.jni.JniScanner;
2121
import org.apache.doris.common.jni.vec.ColumnType;
2222
import org.apache.doris.common.jni.vec.TableSchema;
23-
import org.apache.doris.common.security.authentication.PreExecutionAuthenticator;
24-
import org.apache.doris.common.security.authentication.PreExecutionAuthenticatorCache;
23+
import org.apache.doris.kerberos.PreExecutionAuthenticator;
24+
import org.apache.doris.kerberos.PreExecutionAuthenticatorCache;
2525

2626
import com.google.common.base.Preconditions;
2727
import org.apache.paimon.data.InternalRow;

‎fe/fe-common/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,11 @@ under the License.
6767
</profile>
6868
</profiles>
6969
<dependencies>
70+
<dependency>
71+
<groupId>${project.groupId}</groupId>
72+
<artifactId>fe-kerberos</artifactId>
73+
<version>${project.version}</version>
74+
</dependency>
7075
<dependency>
7176
<groupId>com.google.guava</groupId>
7277
<artifactId>guava</artifactId>

‎fe/fe-common/src/main/java/org/apache/doris/common/security/authentication/AuthType.java‎

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

‎fe/fe-core/src/main/java/org/apache/doris/catalog/HdfsResource.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import org.apache.doris.common.DdlException;
2121
import org.apache.doris.common.proc.BaseProcResult;
22-
import org.apache.doris.common.security.authentication.AuthenticationConfig;
22+
import org.apache.doris.kerberos.AuthenticationConfig;
2323
import org.apache.doris.thrift.THdfsConf;
2424
import org.apache.doris.thrift.THdfsParams;
2525

‎fe/fe-core/src/main/java/org/apache/doris/catalog/HdfsStorageVault.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919

2020
import org.apache.doris.cloud.proto.Cloud;
2121
import org.apache.doris.common.DdlException;
22-
import org.apache.doris.common.security.authentication.AuthenticationConfig;
2322
import org.apache.doris.common.util.DatasourcePrintableMap;
2423
import org.apache.doris.datasource.property.storage.StorageProperties;
2524
import org.apache.doris.filesystem.FileSystem;
2625
import org.apache.doris.filesystem.Location;
2726
import org.apache.doris.fs.FileSystemFactory;
27+
import org.apache.doris.kerberos.AuthenticationConfig;
2828

2929
import com.google.common.base.Preconditions;
3030
import com.google.common.base.Strings;

‎fe/fe-core/src/main/java/org/apache/doris/catalog/HiveTable.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
package org.apache.doris.catalog;
1919

2020
import org.apache.doris.common.DdlException;
21-
import org.apache.doris.common.security.authentication.AuthType;
22-
import org.apache.doris.common.security.authentication.AuthenticationConfig;
2321
import org.apache.doris.datasource.property.metastore.HMSBaseProperties;
2422
import org.apache.doris.datasource.property.storage.S3Properties;
23+
import org.apache.doris.kerberos.AuthType;
24+
import org.apache.doris.kerberos.AuthenticationConfig;
2525
import org.apache.doris.thrift.THiveTable;
2626
import org.apache.doris.thrift.TTableDescriptor;
2727
import org.apache.doris.thrift.TTableType;

‎fe/fe-core/src/main/java/org/apache/doris/common/ThreadPoolManager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package org.apache.doris.common;
1919

2020

21-
import org.apache.doris.common.security.authentication.ExecutionAuthenticator;
21+
import org.apache.doris.kerberos.ExecutionAuthenticator;
2222
import org.apache.doris.metric.Metric;
2323
import org.apache.doris.metric.Metric.MetricUnit;
2424
import org.apache.doris.metric.MetricLabel;

0 commit comments

Comments
 (0)