Skip to content

Commit

Permalink
Extracting encryption from cdap-security into cdap-common
Browse files Browse the repository at this point in the history
  • Loading branch information
@masivesky
masivesky committed Jan 2, 2025
1 parent 1ef91ed commit 00f60af
Show file tree
Hide file tree
Showing 33 changed files with 46 additions and 48 deletions.
2 changes: 1 addition & 1 deletion cdap-app-fabric/src/main/java/io/cdap/cdap/app/guice/AppFabricServiceRuntimeModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
import io.cdap.cdap.scheduler.CoreSchedulerService;
import io.cdap.cdap.scheduler.Scheduler;
import io.cdap.cdap.securestore.spi.SecretStore;
import io.cdap.cdap.security.encryption.guice.DataStorageAeadEncryptionModule;
import io.cdap.cdap.common.encryption.guice.DataStorageAeadEncryptionModule;

Check warning on line 155 in cdap-app-fabric/src/main/java/io/cdap/cdap/app/guice/AppFabricServiceRuntimeModule.java

View workflow job for this annotation

GitHub Actions / Checkstyle

com.puppycrawl.tools.checkstyle.checks.imports.CustomImportOrderCheck 

Wrong lexicographical order for 'io.cdap.cdap.common.encryption.guice.DataStorageAeadEncryptionModule' import. Should be before 'io.cdap.cdap.securestore.spi.SecretStore'.
import io.cdap.cdap.security.impersonation.DefaultOwnerAdmin;
import io.cdap.cdap.security.impersonation.DefaultUGIProvider;
import io.cdap.cdap.security.impersonation.OwnerAdmin;
Expand Down
4 changes: 2 additions & 2 deletions cdap-app-fabric/src/main/java/io/cdap/cdap/internal/credential/CredentialIdentityStore.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
import io.cdap.cdap.proto.credential.CredentialIdentity;
import io.cdap.cdap.proto.id.CredentialIdentityId;
import io.cdap.cdap.proto.id.CredentialProfileId;
import io.cdap.cdap.security.encryption.AeadCipher;
import io.cdap.cdap.security.encryption.guice.DataStorageAeadEncryptionModule;
import io.cdap.cdap.common.encryption.AeadCipher;

Check warning on line 24 in cdap-app-fabric/src/main/java/io/cdap/cdap/internal/credential/CredentialIdentityStore.java

View workflow job for this annotation

GitHub Actions / Checkstyle

com.puppycrawl.tools.checkstyle.checks.imports.CustomImportOrderCheck 

Wrong lexicographical order for 'io.cdap.cdap.common.encryption.AeadCipher' import. Should be before 'io.cdap.cdap.proto.id.CredentialProfileId'.
import io.cdap.cdap.common.encryption.guice.DataStorageAeadEncryptionModule;

Check warning on line 25 in cdap-app-fabric/src/main/java/io/cdap/cdap/internal/credential/CredentialIdentityStore.java

View workflow job for this annotation

GitHub Actions / Checkstyle

com.puppycrawl.tools.checkstyle.checks.imports.CustomImportOrderCheck 

Wrong lexicographical order for 'io.cdap.cdap.common.encryption.guice.DataStorageAeadEncryptionModule' import. Should be before 'io.cdap.cdap.proto.id.CredentialProfileId'.
import io.cdap.cdap.security.spi.encryption.CipherException;
import io.cdap.cdap.spi.data.StructuredRow;
import io.cdap.cdap.spi.data.StructuredTable;
Expand Down
4 changes: 2 additions & 2 deletions cdap-app-fabric/src/main/java/io/cdap/cdap/internal/credential/CredentialProfileStore.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
import io.cdap.cdap.common.NotFoundException;
import io.cdap.cdap.proto.credential.CredentialProfile;
import io.cdap.cdap.proto.id.CredentialProfileId;
import io.cdap.cdap.security.encryption.AeadCipher;
import io.cdap.cdap.security.encryption.guice.DataStorageAeadEncryptionModule;
import io.cdap.cdap.common.encryption.AeadCipher;

Check warning on line 24 in cdap-app-fabric/src/main/java/io/cdap/cdap/internal/credential/CredentialProfileStore.java

View workflow job for this annotation

GitHub Actions / Checkstyle

com.puppycrawl.tools.checkstyle.checks.imports.CustomImportOrderCheck 

Wrong lexicographical order for 'io.cdap.cdap.common.encryption.AeadCipher' import. Should be before 'io.cdap.cdap.proto.id.CredentialProfileId'.
import io.cdap.cdap.common.encryption.guice.DataStorageAeadEncryptionModule;

Check warning on line 25 in cdap-app-fabric/src/main/java/io/cdap/cdap/internal/credential/CredentialProfileStore.java

View workflow job for this annotation

GitHub Actions / Checkstyle

com.puppycrawl.tools.checkstyle.checks.imports.CustomImportOrderCheck 

Wrong lexicographical order for 'io.cdap.cdap.common.encryption.guice.DataStorageAeadEncryptionModule' import. Should be before 'io.cdap.cdap.proto.id.CredentialProfileId'.
import io.cdap.cdap.security.spi.encryption.CipherException;
import io.cdap.cdap.spi.data.StructuredRow;
import io.cdap.cdap.spi.data.StructuredTable;
Expand Down
2 changes: 1 addition & 1 deletion ...app-fabric/src/test/java/io/cdap/cdap/internal/credential/CredentialProviderTestBase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
import io.cdap.cdap.proto.credential.ProvisionedCredential;
import io.cdap.cdap.proto.id.CredentialProfileId;
import io.cdap.cdap.security.authorization.AuthorizationEnforcementModule;
import io.cdap.cdap.security.encryption.NoOpAeadCipher;
import io.cdap.cdap.common.encryption.NoOpAeadCipher;

Check warning on line 39 in cdap-app-fabric/src/test/java/io/cdap/cdap/internal/credential/CredentialProviderTestBase.java

View workflow job for this annotation

GitHub Actions / Checkstyle

com.puppycrawl.tools.checkstyle.checks.imports.CustomImportOrderCheck 

Wrong lexicographical order for 'io.cdap.cdap.common.encryption.NoOpAeadCipher' import. Should be before 'io.cdap.cdap.security.authorization.AuthorizationEnforcementModule'.
import io.cdap.cdap.security.spi.authorization.ContextAccessEnforcer;
import io.cdap.cdap.security.spi.credential.CredentialProvider;
import io.cdap.cdap.security.spi.credential.ProfileValidationException;
Expand Down
2 changes: 1 addition & 1 deletion .../cdap/security/encryption/AeadCipher.java → ...ap/cdap/common/encryption/AeadCipher.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* the License.
*/

package io.cdap.cdap.security.encryption;
package io.cdap.cdap.common.encryption;

import io.cdap.cdap.security.spi.encryption.CipherException;
import io.cdap.cdap.security.spi.encryption.CipherOperationException;
Expand Down
2 changes: 1 addition & 1 deletion ...p/security/encryption/NoOpAeadCipher.java → ...dap/common/encryption/NoOpAeadCipher.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* the License.
*/

package io.cdap.cdap.security.encryption;
package io.cdap.cdap.common.encryption;

/**
* Performs no encryption.
Expand Down
6 changes: 3 additions & 3 deletions ...ion/guice/AbstractAeadCipherProvider.java → ...ion/guice/AbstractAeadCipherProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
* the License.
*/

package io.cdap.cdap.security.encryption.guice;
package io.cdap.cdap.common.encryption.guice;

import io.cdap.cdap.common.conf.CConfiguration;
import io.cdap.cdap.common.conf.SConfiguration;
import io.cdap.cdap.security.encryption.AeadCipher;
import io.cdap.cdap.security.encryption.NoOpAeadCipher;
import io.cdap.cdap.common.encryption.AeadCipher;
import io.cdap.cdap.common.encryption.NoOpAeadCipher;
import java.util.Map;
import javax.inject.Provider;

Expand Down
2 changes: 1 addition & 1 deletion ...ice/AeadCipherCryptorExtensionLoader.java → ...ice/AeadCipherCryptorExtensionLoader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* the License.
*/

package io.cdap.cdap.security.encryption.guice;
package io.cdap.cdap.common.encryption.guice;

import com.google.inject.Inject;
import io.cdap.cdap.common.conf.CConfiguration;
Expand Down
4 changes: 2 additions & 2 deletions .../guice/DataStorageAeadCipherProvider.java → .../guice/DataStorageAeadCipherProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
* the License.
*/

package io.cdap.cdap.security.encryption.guice;
package io.cdap.cdap.common.encryption.guice;

import io.cdap.cdap.common.conf.CConfiguration;
import io.cdap.cdap.common.conf.Constants.Security.Encryption;
import io.cdap.cdap.common.conf.SConfiguration;
import io.cdap.cdap.security.encryption.AeadCipher;
import io.cdap.cdap.common.encryption.AeadCipher;
import java.util.Map;
import javax.inject.Inject;

Expand Down
4 changes: 2 additions & 2 deletions ...uice/DataStorageAeadEncryptionModule.java → ...uice/DataStorageAeadEncryptionModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
* the License.
*/

package io.cdap.cdap.security.encryption.guice;
package io.cdap.cdap.common.encryption.guice;

import com.google.inject.PrivateModule;
import com.google.inject.Scopes;
import com.google.inject.name.Names;
import io.cdap.cdap.security.encryption.AeadCipher;
import io.cdap.cdap.common.encryption.AeadCipher;

/**
* Guice module for encryption bindings for data storage encryption.
Expand Down
4 changes: 2 additions & 2 deletions ...ryption/guice/LazyDelegateAeadCipher.java → ...ryption/guice/LazyDelegateAeadCipher.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
* the License.
*/

package io.cdap.cdap.security.encryption.guice;
package io.cdap.cdap.common.encryption.guice;

import io.cdap.cdap.security.encryption.AeadCipher;
import io.cdap.cdap.common.encryption.AeadCipher;
import io.cdap.cdap.security.spi.encryption.AeadCipherContext;
import io.cdap.cdap.security.spi.encryption.AeadCipherCryptor;
import io.cdap.cdap.security.spi.encryption.CipherException;
Expand Down
4 changes: 2 additions & 2 deletions ...ice/UserCredentialAeadCipherProvider.java → ...ice/UserCredentialAeadCipherProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@
* the License.
*/

package io.cdap.cdap.security.encryption.guice;
package io.cdap.cdap.common.encryption.guice;

import io.cdap.cdap.common.conf.CConfiguration;
import io.cdap.cdap.common.conf.Constants.Security.Authentication;
import io.cdap.cdap.common.conf.Constants.Security.Encryption;
import io.cdap.cdap.common.conf.SConfiguration;
import io.cdap.cdap.security.encryption.AeadCipher;
import io.cdap.cdap.common.encryption.AeadCipher;
import java.util.Map;
import javax.inject.Inject;

Expand Down
4 changes: 2 additions & 2 deletions ...e/UserCredentialAeadEncryptionModule.java → ...e/UserCredentialAeadEncryptionModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
* the License.
*/

package io.cdap.cdap.security.encryption.guice;
package io.cdap.cdap.common.encryption.guice;

import com.google.inject.PrivateModule;
import com.google.inject.Scopes;
import com.google.inject.name.Names;
import io.cdap.cdap.security.encryption.AeadCipher;
import io.cdap.cdap.common.encryption.AeadCipher;

/**
* Guice module for encryption bindings for user credential encryption.
Expand Down
4 changes: 2 additions & 2 deletions .../DataStorageAeadEncryptionModuleTest.java → .../DataStorageAeadEncryptionModuleTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
* the License.
*/

package io.cdap.cdap.security.encryption;
package io.cdap.cdap.common.encryption;

import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.Key;
import com.google.inject.name.Names;
import io.cdap.cdap.common.guice.ConfigModule;
import io.cdap.cdap.security.encryption.guice.DataStorageAeadEncryptionModule;
import io.cdap.cdap.common.encryption.guice.DataStorageAeadEncryptionModule;

Check warning on line 24 in cdap-common/src/test/java/io/cdap/cdap/common/encryption/DataStorageAeadEncryptionModuleTest.java

View workflow job for this annotation

GitHub Actions / Checkstyle

com.puppycrawl.tools.checkstyle.checks.imports.CustomImportOrderCheck 

Wrong lexicographical order for 'io.cdap.cdap.common.encryption.guice.DataStorageAeadEncryptionModule' import. Should be before 'io.cdap.cdap.common.guice.ConfigModule'.
import org.junit.Test;

/**
Expand Down
2 changes: 1 addition & 1 deletion ...p/security/encryption/FakeAeadCipher.java → ...dap/common/encryption/FakeAeadCipher.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* the License.
*/

package io.cdap.cdap.security.encryption;
package io.cdap.cdap.common.encryption;

import com.google.gson.Gson;
import com.google.gson.JsonSyntaxException;
Expand Down
2 changes: 1 addition & 1 deletion ...curity/encryption/FakeAeadCipherTest.java → ...common/encryption/FakeAeadCipherTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* the License.
*/

package io.cdap.cdap.security.encryption;
package io.cdap.cdap.common.encryption;

import com.google.gson.Gson;
import io.cdap.cdap.security.spi.encryption.CipherOperationException;
Expand Down
4 changes: 2 additions & 2 deletions ...erCredentialAeadEncryptionModuleTest.java → ...erCredentialAeadEncryptionModuleTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@
* the License.
*/

package io.cdap.cdap.security.encryption;
package io.cdap.cdap.common.encryption;

import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.Key;
import com.google.inject.name.Names;
import io.cdap.cdap.common.guice.ConfigModule;
import io.cdap.cdap.security.encryption.guice.UserCredentialAeadEncryptionModule;
import io.cdap.cdap.common.encryption.guice.UserCredentialAeadEncryptionModule;

Check warning on line 24 in cdap-common/src/test/java/io/cdap/cdap/common/encryption/UserCredentialAeadEncryptionModuleTest.java

View workflow job for this annotation

GitHub Actions / Checkstyle

com.puppycrawl.tools.checkstyle.checks.imports.CustomImportOrderCheck 

Wrong lexicographical order for 'io.cdap.cdap.common.encryption.guice.UserCredentialAeadEncryptionModule' import. Should be before 'io.cdap.cdap.common.guice.ConfigModule'.
import org.junit.Test;

/**
Expand Down
2 changes: 1 addition & 1 deletion ...ion/guice/LazyDelegateAeadCipherTest.java → ...ion/guice/LazyDelegateAeadCipherTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* the License.
*/

package io.cdap.cdap.security.encryption.guice;
package io.cdap.cdap.common.encryption.guice;

import static org.mockito.Matchers.any;
import static org.mockito.Matchers.argThat;
Expand Down
4 changes: 2 additions & 2 deletions cdap-gateway/src/main/java/io/cdap/cdap/gateway/router/NettyRouter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
import io.cdap.cdap.gateway.router.handlers.HttpStatusRequestHandler;
import io.cdap.cdap.security.auth.TokenValidator;
import io.cdap.cdap.security.auth.UserIdentityExtractor;
import io.cdap.cdap.security.encryption.AeadCipher;
import io.cdap.cdap.security.encryption.guice.UserCredentialAeadEncryptionModule;
import io.cdap.cdap.common.encryption.AeadCipher;

Check warning on line 38 in cdap-gateway/src/main/java/io/cdap/cdap/gateway/router/NettyRouter.java

View workflow job for this annotation

GitHub Actions / Checkstyle

com.puppycrawl.tools.checkstyle.checks.imports.CustomImportOrderCheck 

Wrong lexicographical order for 'io.cdap.cdap.common.encryption.AeadCipher' import. Should be before 'io.cdap.cdap.security.auth.UserIdentityExtractor'.
import io.cdap.cdap.common.encryption.guice.UserCredentialAeadEncryptionModule;

Check warning on line 39 in cdap-gateway/src/main/java/io/cdap/cdap/gateway/router/NettyRouter.java

View workflow job for this annotation

GitHub Actions / Checkstyle

com.puppycrawl.tools.checkstyle.checks.imports.CustomImportOrderCheck 

Wrong lexicographical order for 'io.cdap.cdap.common.encryption.guice.UserCredentialAeadEncryptionModule' import. Should be before 'io.cdap.cdap.security.auth.UserIdentityExtractor'.
import io.cdap.cdap.security.impersonation.SecurityUtil;
import io.cdap.http.SSLConfig;
import io.cdap.http.SSLHandlerFactory;
Expand Down
2 changes: 1 addition & 1 deletion cdap-gateway/src/main/java/io/cdap/cdap/gateway/router/RouterMain.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
import io.cdap.cdap.common.guice.ZkClientModule;
import io.cdap.cdap.common.guice.ZkDiscoveryModule;
import io.cdap.cdap.common.runtime.DaemonMain;
import io.cdap.cdap.security.encryption.guice.UserCredentialAeadEncryptionModule;
import io.cdap.cdap.common.encryption.guice.UserCredentialAeadEncryptionModule;

Check warning on line 32 in cdap-gateway/src/main/java/io/cdap/cdap/gateway/router/RouterMain.java

View workflow job for this annotation

GitHub Actions / Checkstyle

com.puppycrawl.tools.checkstyle.checks.imports.CustomImportOrderCheck 

Wrong lexicographical order for 'io.cdap.cdap.common.encryption.guice.UserCredentialAeadEncryptionModule' import. Should be before 'io.cdap.cdap.common.runtime.DaemonMain'.
import io.cdap.cdap.security.guice.CoreSecurityRuntimeModule;
import io.cdap.cdap.security.guice.ExternalAuthenticationModule;
import io.cdap.cdap.security.impersonation.SecurityUtil;
Expand Down
2 changes: 1 addition & 1 deletion cdap-gateway/src/main/java/io/cdap/cdap/gateway/router/handlers/AuthenticationHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import io.cdap.cdap.security.auth.UserIdentityExtractionState;
import io.cdap.cdap.security.auth.UserIdentityExtractor;
import io.cdap.cdap.security.auth.UserIdentityPair;
import io.cdap.cdap.security.encryption.AeadCipher;
import io.cdap.cdap.common.encryption.AeadCipher;

Check warning on line 35 in cdap-gateway/src/main/java/io/cdap/cdap/gateway/router/handlers/AuthenticationHandler.java

View workflow job for this annotation

GitHub Actions / Checkstyle

com.puppycrawl.tools.checkstyle.checks.imports.CustomImportOrderCheck 

Wrong lexicographical order for 'io.cdap.cdap.common.encryption.AeadCipher' import. Should be before 'io.cdap.cdap.security.auth.UserIdentityPair'.
import io.cdap.cdap.security.server.GrantAccessToken;
import io.cdap.cdap.security.spi.encryption.CipherException;
import io.netty.buffer.ByteBuf;
Expand Down
2 changes: 1 addition & 1 deletion cdap-gateway/src/test/java/io/cdap/cdap/gateway/router/AuditLogTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import io.cdap.cdap.common.security.AuditDetail;
import io.cdap.cdap.common.security.AuditPolicy;
import io.cdap.cdap.security.auth.TokenValidator;
import io.cdap.cdap.security.encryption.NoOpAeadCipher;
import io.cdap.cdap.common.encryption.NoOpAeadCipher;

Check warning on line 34 in cdap-gateway/src/test/java/io/cdap/cdap/gateway/router/AuditLogTest.java

View workflow job for this annotation

GitHub Actions / Checkstyle

com.puppycrawl.tools.checkstyle.checks.imports.CustomImportOrderCheck 

Wrong lexicographical order for 'io.cdap.cdap.common.encryption.NoOpAeadCipher' import. Should be before 'io.cdap.cdap.security.auth.TokenValidator'.
import io.cdap.http.AbstractHttpHandler;
import io.cdap.http.HttpResponder;
import io.cdap.http.NettyHttpService;
Expand Down
2 changes: 1 addition & 1 deletion cdap-gateway/src/test/java/io/cdap/cdap/gateway/router/AuthServerAnnounceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import io.cdap.cdap.security.auth.AuthenticationMode;
import io.cdap.cdap.security.auth.TokenValidator;
import io.cdap.cdap.security.auth.UserIdentityExtractor;
import io.cdap.cdap.security.encryption.NoOpAeadCipher;
import io.cdap.cdap.common.encryption.NoOpAeadCipher;

Check warning on line 34 in cdap-gateway/src/test/java/io/cdap/cdap/gateway/router/AuthServerAnnounceTest.java

View workflow job for this annotation

GitHub Actions / Checkstyle

com.puppycrawl.tools.checkstyle.checks.imports.CustomImportOrderCheck 

Wrong lexicographical order for 'io.cdap.cdap.common.encryption.NoOpAeadCipher' import. Should be before 'io.cdap.cdap.security.auth.UserIdentityExtractor'.
import io.cdap.cdap.security.guice.CoreSecurityRuntimeModule;
import io.cdap.cdap.security.guice.ExternalAuthenticationModule;
import io.cdap.cdap.security.server.GrantAccessToken;
Expand Down
2 changes: 1 addition & 1 deletion cdap-gateway/src/test/java/io/cdap/cdap/gateway/router/ConfigBasedRequestBlockingTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import io.cdap.cdap.common.conf.Constants;
import io.cdap.cdap.common.conf.SConfiguration;
import io.cdap.cdap.security.auth.TokenValidator;
import io.cdap.cdap.security.encryption.NoOpAeadCipher;
import io.cdap.cdap.common.encryption.NoOpAeadCipher;

Check warning on line 25 in cdap-gateway/src/test/java/io/cdap/cdap/gateway/router/ConfigBasedRequestBlockingTest.java

View workflow job for this annotation

GitHub Actions / Checkstyle

com.puppycrawl.tools.checkstyle.checks.imports.CustomImportOrderCheck 

Wrong lexicographical order for 'io.cdap.cdap.common.encryption.NoOpAeadCipher' import. Should be before 'io.cdap.cdap.security.auth.TokenValidator'.
import io.cdap.http.NettyHttpService;
import io.netty.handler.codec.http.HttpResponseStatus;
import java.io.IOException;
Expand Down
2 changes: 1 addition & 1 deletion cdap-gateway/src/test/java/io/cdap/cdap/gateway/router/NettyRouterHttpTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import io.cdap.cdap.common.guice.InMemoryDiscoveryModule;
import io.cdap.cdap.internal.guice.AppFabricTestModule;
import io.cdap.cdap.security.auth.UserIdentityExtractor;
import io.cdap.cdap.security.encryption.NoOpAeadCipher;
import io.cdap.cdap.common.encryption.NoOpAeadCipher;

Check warning on line 31 in cdap-gateway/src/test/java/io/cdap/cdap/gateway/router/NettyRouterHttpTest.java

View workflow job for this annotation

GitHub Actions / Checkstyle

com.puppycrawl.tools.checkstyle.checks.imports.CustomImportOrderCheck 

Wrong lexicographical order for 'io.cdap.cdap.common.encryption.NoOpAeadCipher' import. Should be before 'io.cdap.cdap.security.auth.UserIdentityExtractor'.
import io.cdap.cdap.security.guice.CoreSecurityRuntimeModule;
import io.cdap.cdap.security.guice.ExternalAuthenticationModule;
import java.net.InetSocketAddress;
Expand Down
2 changes: 1 addition & 1 deletion cdap-gateway/src/test/java/io/cdap/cdap/gateway/router/NettyRouterHttpsTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import io.cdap.cdap.common.security.KeyStoresTest;
import io.cdap.cdap.internal.guice.AppFabricTestModule;
import io.cdap.cdap.security.auth.UserIdentityExtractor;
import io.cdap.cdap.security.encryption.NoOpAeadCipher;
import io.cdap.cdap.common.encryption.NoOpAeadCipher;

Check warning on line 33 in cdap-gateway/src/test/java/io/cdap/cdap/gateway/router/NettyRouterHttpsTest.java

View workflow job for this annotation

GitHub Actions / Checkstyle

com.puppycrawl.tools.checkstyle.checks.imports.CustomImportOrderCheck 

Wrong lexicographical order for 'io.cdap.cdap.common.encryption.NoOpAeadCipher' import. Should be before 'io.cdap.cdap.security.auth.UserIdentityExtractor'.
import io.cdap.cdap.security.guice.CoreSecurityRuntimeModule;
import io.cdap.cdap.security.guice.ExternalAuthenticationModule;
import io.cdap.common.http.HttpRequests;
Expand Down
2 changes: 1 addition & 1 deletion cdap-gateway/src/test/java/io/cdap/cdap/gateway/router/NettyRouterTestBase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
import io.cdap.cdap.common.discovery.ResolvingDiscoverable;
import io.cdap.cdap.common.http.AbstractBodyConsumer;
import io.cdap.cdap.security.auth.TokenValidator;
import io.cdap.cdap.security.encryption.NoOpAeadCipher;
import io.cdap.cdap.common.encryption.NoOpAeadCipher;

Check warning on line 41 in cdap-gateway/src/test/java/io/cdap/cdap/gateway/router/NettyRouterTestBase.java

View workflow job for this annotation

GitHub Actions / Checkstyle

com.puppycrawl.tools.checkstyle.checks.imports.CustomImportOrderCheck 

Wrong lexicographical order for 'io.cdap.cdap.common.encryption.NoOpAeadCipher' import. Should be before 'io.cdap.cdap.security.auth.TokenValidator'.
import io.cdap.http.AbstractHttpHandler;
import io.cdap.http.BodyConsumer;
import io.cdap.http.ChannelPipelineModifier;
Expand Down
2 changes: 1 addition & 1 deletion cdap-gateway/src/test/java/io/cdap/cdap/gateway/router/RouterResource.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import io.cdap.cdap.internal.guice.AppFabricTestModule;
import io.cdap.cdap.security.auth.TokenValidator;
import io.cdap.cdap.security.auth.UserIdentityExtractor;
import io.cdap.cdap.security.encryption.NoOpAeadCipher;
import io.cdap.cdap.common.encryption.NoOpAeadCipher;

Check warning on line 29 in cdap-gateway/src/test/java/io/cdap/cdap/gateway/router/RouterResource.java

View workflow job for this annotation

GitHub Actions / Checkstyle

com.puppycrawl.tools.checkstyle.checks.imports.CustomImportOrderCheck 

Wrong lexicographical order for 'io.cdap.cdap.common.encryption.NoOpAeadCipher' import. Should be before 'io.cdap.cdap.security.auth.UserIdentityExtractor'.
import io.cdap.cdap.security.guice.CoreSecurityRuntimeModule;
import io.cdap.cdap.security.guice.ExternalAuthenticationModule;
import java.net.InetSocketAddress;
Expand Down
2 changes: 1 addition & 1 deletion cdap-gateway/src/test/java/io/cdap/cdap/gateway/router/RoutingToDataSetsTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import io.cdap.cdap.common.utils.Networks;
import io.cdap.cdap.internal.guice.AppFabricTestModule;
import io.cdap.cdap.security.auth.UserIdentityExtractor;
import io.cdap.cdap.security.encryption.NoOpAeadCipher;
import io.cdap.cdap.common.encryption.NoOpAeadCipher;

Check warning on line 31 in cdap-gateway/src/test/java/io/cdap/cdap/gateway/router/RoutingToDataSetsTest.java

View workflow job for this annotation

GitHub Actions / Checkstyle

com.puppycrawl.tools.checkstyle.checks.imports.CustomImportOrderCheck 

Wrong lexicographical order for 'io.cdap.cdap.common.encryption.NoOpAeadCipher' import. Should be before 'io.cdap.cdap.security.auth.UserIdentityExtractor'.
import io.cdap.cdap.security.guice.CoreSecurityRuntimeModule;
import io.cdap.cdap.security.guice.ExternalAuthenticationModule;
import io.cdap.http.AbstractHttpHandler;
Expand Down
2 changes: 1 addition & 1 deletion cdap-master/src/main/java/io/cdap/cdap/master/environment/k8s/RouterServiceMain.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import io.cdap.cdap.master.spi.environment.MasterEnvironmentContext;
import io.cdap.cdap.messaging.guice.MessagingServiceModule;
import io.cdap.cdap.proto.id.NamespaceId;
import io.cdap.cdap.security.encryption.guice.UserCredentialAeadEncryptionModule;
import io.cdap.cdap.common.encryption.guice.UserCredentialAeadEncryptionModule;

Check warning on line 35 in cdap-master/src/main/java/io/cdap/cdap/master/environment/k8s/RouterServiceMain.java

View workflow job for this annotation

GitHub Actions / Checkstyle

com.puppycrawl.tools.checkstyle.checks.imports.CustomImportOrderCheck 

Wrong lexicographical order for 'io.cdap.cdap.common.encryption.guice.UserCredentialAeadEncryptionModule' import. Should be before 'io.cdap.cdap.proto.id.NamespaceId'.
import io.cdap.cdap.security.guice.ExternalAuthenticationModule;
import java.util.ArrayList;
import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion ...ity/src/main/java/io/cdap/cdap/security/authorization/AuthorizationEnforcementModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import io.cdap.cdap.proto.element.EntityType;
import io.cdap.cdap.proto.id.EntityId;
import io.cdap.cdap.proto.security.Permission;
import io.cdap.cdap.security.encryption.guice.UserCredentialAeadEncryptionModule;
import io.cdap.cdap.common.encryption.guice.UserCredentialAeadEncryptionModule;

Check warning on line 29 in cdap-security/src/main/java/io/cdap/cdap/security/authorization/AuthorizationEnforcementModule.java

View workflow job for this annotation

GitHub Actions / Checkstyle

com.puppycrawl.tools.checkstyle.checks.imports.CustomImportOrderCheck 

Wrong lexicographical order for 'io.cdap.cdap.common.encryption.guice.UserCredentialAeadEncryptionModule' import. Should be before 'io.cdap.cdap.proto.security.Permission'.
import io.cdap.cdap.security.impersonation.SecurityUtil;
import io.cdap.cdap.security.spi.authorization.AccessEnforcer;
import io.cdap.cdap.security.spi.authorization.ContextAccessEnforcer;
Expand Down
6 changes: 2 additions & 4 deletions cdap-security/src/main/java/io/cdap/cdap/security/authorization/DefaultAccessEnforcer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,16 @@
import io.cdap.cdap.proto.security.Permission;
import io.cdap.cdap.proto.security.Principal;
import io.cdap.cdap.proto.security.Role;
import io.cdap.cdap.security.encryption.AeadCipher;
import io.cdap.cdap.security.encryption.guice.UserCredentialAeadEncryptionModule;
import io.cdap.cdap.common.encryption.AeadCipher;

Check warning on line 39 in cdap-security/src/main/java/io/cdap/cdap/security/authorization/DefaultAccessEnforcer.java

View workflow job for this annotation

GitHub Actions / Checkstyle

com.puppycrawl.tools.checkstyle.checks.imports.CustomImportOrderCheck 

Wrong lexicographical order for 'io.cdap.cdap.common.encryption.AeadCipher' import. Should be before 'io.cdap.cdap.proto.security.Role'.
import io.cdap.cdap.common.encryption.guice.UserCredentialAeadEncryptionModule;

Check warning on line 40 in cdap-security/src/main/java/io/cdap/cdap/security/authorization/DefaultAccessEnforcer.java

View workflow job for this annotation

GitHub Actions / Checkstyle

com.puppycrawl.tools.checkstyle.checks.imports.CustomImportOrderCheck 

Wrong lexicographical order for 'io.cdap.cdap.common.encryption.guice.UserCredentialAeadEncryptionModule' import. Should be before 'io.cdap.cdap.proto.security.Role'.
import io.cdap.cdap.security.impersonation.SecurityUtil;
import io.cdap.cdap.security.spi.authentication.AuthenticationContext;
import io.cdap.cdap.security.spi.authorization.AccessEnforcer;
import io.cdap.cdap.security.spi.authorization.AuditLogContext;
import io.cdap.cdap.security.spi.authorization.AuthorizationResponse;
import io.cdap.cdap.security.spi.authorization.AuthorizedResult;
import io.cdap.cdap.security.spi.encryption.CipherException;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.TimeUnit;
Expand Down
2 changes: 1 addition & 1 deletion ...security/src/test/java/io/cdap/cdap/security/authorization/DefaultAccessEnforcerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
import io.cdap.cdap.proto.security.StandardPermission;
import io.cdap.cdap.security.auth.CipherException;
import io.cdap.cdap.security.auth.context.AuthenticationTestContext;
import io.cdap.cdap.security.encryption.FakeAeadCipher;
import io.cdap.cdap.common.encryption.FakeAeadCipher;

Check warning on line 50 in cdap-security/src/test/java/io/cdap/cdap/security/authorization/DefaultAccessEnforcerTest.java

View workflow job for this annotation

GitHub Actions / Checkstyle

com.puppycrawl.tools.checkstyle.checks.imports.CustomImportOrderCheck 

Wrong lexicographical order for 'io.cdap.cdap.common.encryption.FakeAeadCipher' import. Should be before 'io.cdap.cdap.security.auth.context.AuthenticationTestContext'.
import io.cdap.cdap.security.spi.authentication.AuthenticationContext;
import io.cdap.cdap.security.spi.authorization.AccessControllerSpi;
import io.cdap.cdap.security.spi.authorization.AccessEnforcer;
Expand Down

0 comments on commit 00f60af

Please sign in to comment.