awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-07 15:27:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: improve UI and lint fix

Browse Source
This commit is contained in:
Meet
2024-10-01 01:34:24 +05:30
parent 54e4314e88
commit b0e536e576
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/services/external-migration/external-migration-fns.ts
+10 -7
View File
@@ -1,14 +1,17 @@
import { randomUUID } from "crypto"; import { randomUUID } from "crypto";
import { codec, hash } from "sjcl"; import sjcl from "sjcl";
import { secretbox } from "tweetnacl"; import tweetnacl from "tweetnacl";
import { decodeBase64, encodeUTF8 } from "tweetnacl-util"; import tweetnaclUtil from "tweetnacl-util";
import { InfisicalImportData, TEnvKeyExportJSON } from "./external-migration-types"; import { InfisicalImportData, TEnvKeyExportJSON } from "./external-migration-types";
const { codec, hash } = sjcl;
const { secretbox } = tweetnacl;
export const decryptEnvKeyData = async (decryptionKey: string, encryptedJson: { nonce: string; data: string }) => { export const decryptEnvKeyData = async (decryptionKey: string, encryptedJson: { nonce: string; data: string }) => {
const key = decodeBase64(codec.base64.fromBits(hash.sha256.hash(decryptionKey))); const key = tweetnaclUtil.decodeBase64(codec.base64.fromBits(hash.sha256.hash(decryptionKey)));
const nonce = decodeBase64(encryptedJson.nonce); const nonce = tweetnaclUtil.decodeBase64(encryptedJson.nonce);
const encryptedData = decodeBase64(encryptedJson.data); const encryptedData = tweetnaclUtil.decodeBase64(encryptedJson.data);
const decrypted = secretbox.open(encryptedData, nonce, key); const decrypted = secretbox.open(encryptedData, nonce, key);
@@ -16,7 +19,7 @@ export const decryptEnvKeyData = async (decryptionKey: string, encryptedJson: {
throw new Error("Decryption failed, please check the entered encryption key"); throw new Error("Decryption failed, please check the entered encryption key");
} }
const decryptedJson = encodeUTF8(decrypted); const decryptedJson = tweetnaclUtil.encodeUTF8(decrypted);
return decryptedJson; return decryptedJson;
}; };
frontend/src/views/Settings/OrgSettingsPage/components/ImportTab/ImportTab.tsx
+10 -1
View File
@@ -189,8 +189,17 @@ export const ImportTab = () => {
onClick={() => { onClick={() => {
fileUploadRef?.current?.click(); fileUploadRef?.current?.click();
}} }}
> >
{fileUploadRef?.current?.value ? (
<span className="text-green text-sm">
{fileUploadRef?.current?.value.split("\\").pop()}
</span>
) : (
<>
Upload export file&nbsp;
<FontAwesomeIcon icon={faUpload} size="xs" /> <FontAwesomeIcon icon={faUpload} size="xs" />
</>
)}
</IconButton> </IconButton>
</> </>
</FormControl> </FormControl>