From 3b249a2c5b18dbaf18cc4492f7d7fa0ebcd4f756 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Fri, 26 Aug 2016 18:51:03 +0200 Subject: [PATCH] reduce explicit usage of OneTimeString --- platform/credential-store/src/KeePassCredentialStore.kt | 6 +++--- platform/credential-store/src/credentialStore.kt | 2 +- .../credential-store/test/KeePassCredentialStoreTest.kt | 2 +- platform/credential-store/test/NativeKeychainTest.kt | 2 +- .../src/com/intellij/credentialStore/CredentialStore.java | 2 +- .../src/com/intellij/ide/passwordSafe/PasswordStorage.java | 3 +-- .../ide/passwordSafe/impl/providers/EncryptionUtil.java | 7 ------- .../ide/passwordSafe/ui/PasswordSafePromptDialog.java | 3 +-- .../src/git4idea/commands/GitHttpGuiAuthenticator.java | 3 +-- .../org/zmlx/hg4idea/execution/HgCommandAuthenticator.java | 7 +++---- .../settings-repository/src/git/JGitCredentialsProvider.kt | 3 +-- plugins/settings-repository/src/git/gitCredential.kt | 3 +-- 12 files changed, 15 insertions(+), 28 deletions(-) diff --git a/platform/credential-store/src/KeePassCredentialStore.kt b/platform/credential-store/src/KeePassCredentialStore.kt index f43cfcb829ac..198ae9b79085 100644 --- a/platform/credential-store/src/KeePassCredentialStore.kt +++ b/platform/credential-store/src/KeePassCredentialStore.kt @@ -110,7 +110,7 @@ internal class KeePassCredentialStore(keyToValue: Map requestor, @NotNull String accountName, @Nullable String value) { - set(CredentialAttributes(requestor, accountName), value == null ? null : new Credentials(accountName, new OneTimeString(value))); + set(CredentialAttributes(requestor, accountName), value == null ? null : new Credentials(accountName, value)); } /** diff --git a/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/EncryptionUtil.java b/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/EncryptionUtil.java index 297786e55522..c963434c5f10 100644 --- a/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/EncryptionUtil.java +++ b/platform/platform-impl/src/com/intellij/ide/passwordSafe/impl/providers/EncryptionUtil.java @@ -163,13 +163,6 @@ public class EncryptionUtil { } } - /** - * Encrypt text - * - * @param password the secret key to use - * @param text the text to encrypt - * @return encrypted text - */ public static byte[] encryptText(byte[] password, @NotNull OneTimeString value) { byte[] data = value.toByteArray(false); return encryptData(password, data.length, data); diff --git a/platform/platform-impl/src/com/intellij/ide/passwordSafe/ui/PasswordSafePromptDialog.java b/platform/platform-impl/src/com/intellij/ide/passwordSafe/ui/PasswordSafePromptDialog.java index c1d23f9985d6..74f338d089d5 100644 --- a/platform/platform-impl/src/com/intellij/ide/passwordSafe/ui/PasswordSafePromptDialog.java +++ b/platform/platform-impl/src/com/intellij/ide/passwordSafe/ui/PasswordSafePromptDialog.java @@ -16,7 +16,6 @@ package com.intellij.ide.passwordSafe.ui; import com.intellij.credentialStore.Credentials; -import com.intellij.credentialStore.OneTimeString; import com.intellij.ide.passwordSafe.PasswordSafe; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ModalityState; @@ -147,7 +146,7 @@ public class PasswordSafePromptDialog extends DialogWrapper { d.setErrorText(error); if (d.showAndGet()) { - Credentials credentials = new Credentials(component.getUserName(), new OneTimeString(component.getPassword())); + Credentials credentials = new Credentials(component.getUserName(), component.getPassword()); ref.set(credentials); ps.set(CredentialAttributes(requestor, accountName), credentials, !component.isRememberSelected()); } diff --git a/plugins/git4idea/src/git4idea/commands/GitHttpGuiAuthenticator.java b/plugins/git4idea/src/git4idea/commands/GitHttpGuiAuthenticator.java index 4276569727d9..96d8f9d3c6f5 100644 --- a/plugins/git4idea/src/git4idea/commands/GitHttpGuiAuthenticator.java +++ b/plugins/git4idea/src/git4idea/commands/GitHttpGuiAuthenticator.java @@ -16,7 +16,6 @@ package git4idea.commands; import com.intellij.credentialStore.Credentials; -import com.intellij.credentialStore.OneTimeString; import com.intellij.ide.passwordSafe.PasswordSafe; import com.intellij.ide.passwordSafe.ui.PasswordSafePromptDialog; import com.intellij.openapi.application.ApplicationManager; @@ -172,7 +171,7 @@ class GitHttpGuiAuthenticator implements GitHttpAuthenticator { // save password if (myPasswordKey != null && myPassword != null) { - Credentials credentials = new Credentials(myPasswordKey, new OneTimeString(myPassword)); + Credentials credentials = new Credentials(myPasswordKey, myPassword); PasswordSafe.getInstance().set(CredentialAttributes(PASS_REQUESTER, credentials.getUserName()), credentials, !mySaveOnDisk); } } diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgCommandAuthenticator.java b/plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgCommandAuthenticator.java index b6515952ba05..fee46fc9d520 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgCommandAuthenticator.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgCommandAuthenticator.java @@ -114,7 +114,7 @@ class HgCommandAuthenticator { // don't show dialog if we don't have to (both fields are known) except force authorization required if (!myForceAuthorization && !StringUtil.isEmptyOrSpaces(password) && !StringUtil.isEmptyOrSpaces(login)) { - myCredentials = new Credentials(login, new OneTimeString(password)); + myCredentials = new Credentials(login, password); ok = true; return; } @@ -129,7 +129,7 @@ class HgCommandAuthenticator { login, password, true); if (dialog.showAndGet()) { ok = true; - Credentials credentials = new Credentials(dialog.getUsername(), new OneTimeString(dialog.getPassword())); + Credentials credentials = new Credentials(dialog.getUsername(), dialog.getPassword()); myCredentials = credentials; PasswordSafe.getInstance().set(CredentialAttributes(HgCommandAuthenticator.class, keyForUrlAndLogin(url, credentials.getUserName())), credentials, !dialog.isRememberPassword()); hgGlobalSettings.addRememberedUrl(url, credentials.getUserName()); @@ -141,8 +141,7 @@ class HgCommandAuthenticator { } public String getPassword() { - OneTimeString password = myCredentials == null ? null : myCredentials.getPassword(); - return password == null ? null : password.toString(false); + return myCredentials == null ? null : myCredentials.getPasswordAsString(false); } public boolean isOk() { diff --git a/plugins/settings-repository/src/git/JGitCredentialsProvider.kt b/plugins/settings-repository/src/git/JGitCredentialsProvider.kt index 75d08359413e..fe9eabe3a54c 100644 --- a/plugins/settings-repository/src/git/JGitCredentialsProvider.kt +++ b/plugins/settings-repository/src/git/JGitCredentialsProvider.kt @@ -18,7 +18,6 @@ package org.jetbrains.settingsRepository.git import com.google.common.cache.CacheBuilder import com.google.common.cache.CacheLoader import com.intellij.credentialStore.Credentials -import com.intellij.credentialStore.OneTimeString import com.intellij.credentialStore.isFulfilled import com.intellij.credentialStore.macOs.isMacOsCredentialStoreSupported import com.intellij.openapi.ui.MessageDialogBuilder @@ -96,7 +95,7 @@ class JGitCredentialsProvider(private val credentialsStore: Lazy