yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2026-01-08 21:48:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deleting CipherText introduced for building pagination cursors is no longer used (#7142)

Browse Source
This commit is contained in:
Suresh Srinivas 2022-09-01 14:10:50 -07:00 committed by GitHub
parent 26b1bfb343
commit 4e335796ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 0 additions and 206 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
common/src/main/java/org/openmetadata/common/utils/CipherText.java
View File

@ -1,72 +0,0 @@
/*
* Copyright 2021 Collate
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.openmetadata.common.utils;
import java.nio.charset.StandardCharsets;
import java.security.GeneralSecurityException;
import java.security.InvalidKeyException;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Arrays;
import java.util.Base64;
import java.util.Random;
import javax.crypto.BadPaddingException;
import javax.crypto.Cipher;
import javax.crypto.IllegalBlockSizeException;
import javax.crypto.NoSuchPaddingException;
import javax.crypto.spec.SecretKeySpec;
/** Class that uses AEC encryption to encrypt and decrypt plain text */
public final class CipherText {
private static CipherText instance = null;
private static SecretKeySpec secretKey;
private CipherText() throws NoSuchAlgorithmException {
// Generate random set of bytes to be used as secret key
byte[] bytes = new byte[16];
new Random().nextBytes(bytes);
// Generate secret key from random bytes
bytes = MessageDigest.getInstance("SHA-1").digest(bytes);
secretKey = new SecretKeySpec(Arrays.copyOf(bytes, 16), "AES");
}
public static CipherText instance() throws NoSuchAlgorithmException {
if (instance == null) {
instance = new CipherText();
}
return instance;
}
public String encrypt(String strToEncrypt)
throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidKeyException, IllegalBlockSizeException,
BadPaddingException {
if (strToEncrypt == null) {
return null;
}
// Initialize Cipher with the secret key
Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
cipher.init(Cipher.ENCRYPT_MODE, secretKey);
return Base64.getUrlEncoder().encodeToString(cipher.doFinal(strToEncrypt.getBytes(StandardCharsets.UTF_8)));
}
public String decrypt(String strToDecrypt) throws GeneralSecurityException {
if (strToDecrypt == null) {
return null;
}
Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5PADDING");
cipher.init(Cipher.DECRYPT_MODE, secretKey);
return new String(cipher.doFinal(Base64.getUrlDecoder().decode(strToDecrypt)));
}
}

32
common/src/test/java/org/openmetadata/common/utils/CipherTextTest.java
View File

@ -1,32 +0,0 @@
/*
* Copyright 2021 Collate
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.openmetadata.common.utils;
import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.UnsupportedEncodingException;
import java.security.GeneralSecurityException;
import org.junit.jupiter.api.Test;
class CipherTextTest {
@Test
void encryptDecryptTest() throws GeneralSecurityException, UnsupportedEncodingException {
CipherText cipherText = CipherText.instance();
String[] strings = {"test1", "test2", "service.dwh.fact_trip", "random text", "user@domain.com"};
for (String str : strings) {
String encryptedStr = cipherText.encrypt(str);
assertEquals(str, cipherText.decrypt(encryptedStr));
}
}
}

70
openmetadata-core/src/main/java/org/openmetadata/core/util/CipherText.java
View File

@ -1,70 +0,0 @@
package org.openmetadata.core.util; /*
* Copyright 2021 Collate
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import java.nio.charset.StandardCharsets;
import java.security.GeneralSecurityException;
import java.security.InvalidKeyException;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Arrays;
import java.util.Base64;
import java.util.Random;
import javax.crypto.BadPaddingException;
import javax.crypto.Cipher;
import javax.crypto.IllegalBlockSizeException;
import javax.crypto.NoSuchPaddingException;
import javax.crypto.spec.SecretKeySpec;
/** Class that uses AEC encryption to encrypt and decrypt plain text */
public final class CipherText {
private static CipherText instance = null;
private static SecretKeySpec secretKey;
private CipherText() throws NoSuchAlgorithmException {
// Generate random set of bytes to be used as secret key
byte[] bytes = new byte[16];
new Random().nextBytes(bytes);
// Generate secret key from random bytes
bytes = MessageDigest.getInstance("SHA-1").digest(bytes);
secretKey = new SecretKeySpec(Arrays.copyOf(bytes, 16), "AES");
}
public static CipherText instance() throws NoSuchAlgorithmException {
if (instance == null) {
instance = new CipherText();
}
return instance;
}
public String encrypt(String strToEncrypt)
throws NoSuchPaddingException, NoSuchAlgorithmException, InvalidKeyException, IllegalBlockSizeException,
BadPaddingException {
if (strToEncrypt == null) {
return null;
}
// Initialize Cipher with the secret key
Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding");
cipher.init(Cipher.ENCRYPT_MODE, secretKey);
return Base64.getUrlEncoder().encodeToString(cipher.doFinal(strToEncrypt.getBytes(StandardCharsets.UTF_8)));
}
public String decrypt(String strToDecrypt) throws GeneralSecurityException {
if (strToDecrypt == null) {
return null;
}
Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5PADDING");
cipher.init(Cipher.DECRYPT_MODE, secretKey);
return new String(cipher.doFinal(Base64.getUrlDecoder().decode(strToDecrypt)));
}
}

32
openmetadata-core/src/test/java/org/openmetadata/core/util/CipherTextTest.java
View File

@ -1,32 +0,0 @@
/*
* Copyright 2021 Collate
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* http://www.apache.org/licenses/LICENSE-2.0
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.openmetadata.core.util;
import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.UnsupportedEncodingException;
import java.security.GeneralSecurityException;
import org.junit.jupiter.api.Test;
class CipherTextTest {
@Test
void encryptDecryptTest() throws GeneralSecurityException, UnsupportedEncodingException {
CipherText cipherText = CipherText.instance();
String[] strings = {"test1", "test2", "service.dwh.fact_trip", "random text", "user@domain.com"};
for (String str : strings) {
String encryptedStr = cipherText.encrypt(str);
assertEquals(str, cipherText.decrypt(encryptedStr));
}
}
}