mirror of
https://we.phorge.it/source/phorge.git
synced 2024-11-19 21:32:43 +01:00
Passphrase - added "looked at secret" transaction.
Summary: Fixes T4376. Only thing I don't like in the current implementation is clicking "Done" doesn't refresh the page so you don't see the viewed secret transaction until you reload. Also made the textarea read-only as when I was playing with this for the first time I assumed I could also edit from the view secret side of things. Test Plan: Viewed some secrets, saw some transactions. Reviewers: epriestley Reviewed By: epriestley CC: Korvin, epriestley, aran Maniphest Tasks: T4376 Differential Revision: https://secure.phabricator.com/D8345
This commit is contained in:
parent
9b0f906207
commit
64d15c344e
3 changed files with 26 additions and 1 deletions
|
@ -35,6 +35,7 @@ final class PassphraseCredentialRevealController
|
||||||
->appendChild(
|
->appendChild(
|
||||||
id(new AphrontFormTextAreaControl())
|
id(new AphrontFormTextAreaControl())
|
||||||
->setLabel(pht('Plaintext'))
|
->setLabel(pht('Plaintext'))
|
||||||
|
->setReadOnly(true)
|
||||||
->setValue($credential->getSecret()->openEnvelope()));
|
->setValue($credential->getSecret()->openEnvelope()));
|
||||||
} else {
|
} else {
|
||||||
$body = pht('This credential has no associated secret.');
|
$body = pht('This credential has no associated secret.');
|
||||||
|
@ -46,6 +47,17 @@ final class PassphraseCredentialRevealController
|
||||||
->appendChild($body)
|
->appendChild($body)
|
||||||
->addCancelButton($view_uri, pht('Done'));
|
->addCancelButton($view_uri, pht('Done'));
|
||||||
|
|
||||||
|
$type_secret = PassphraseCredentialTransaction::TYPE_LOOKEDATSECRET;
|
||||||
|
$xactions = array(id(new PassphraseCredentialTransaction())
|
||||||
|
->setTransactionType($type_secret)
|
||||||
|
->setNewValue(true));
|
||||||
|
|
||||||
|
$editor = id(new PassphraseCredentialTransactionEditor())
|
||||||
|
->setActor($viewer)
|
||||||
|
->setContinueOnNoEffect(true)
|
||||||
|
->setContentSourceFromRequest($request)
|
||||||
|
->applyTransactions($credential, $xactions);
|
||||||
|
|
||||||
return id(new AphrontDialogResponse())->setDialog($dialog);
|
return id(new AphrontDialogResponse())->setDialog($dialog);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -14,6 +14,7 @@ final class PassphraseCredentialTransactionEditor
|
||||||
$types[] = PassphraseCredentialTransaction::TYPE_USERNAME;
|
$types[] = PassphraseCredentialTransaction::TYPE_USERNAME;
|
||||||
$types[] = PassphraseCredentialTransaction::TYPE_SECRET_ID;
|
$types[] = PassphraseCredentialTransaction::TYPE_SECRET_ID;
|
||||||
$types[] = PassphraseCredentialTransaction::TYPE_DESTROY;
|
$types[] = PassphraseCredentialTransaction::TYPE_DESTROY;
|
||||||
|
$types[] = PassphraseCredentialTransaction::TYPE_LOOKEDATSECRET;
|
||||||
|
|
||||||
return $types;
|
return $types;
|
||||||
}
|
}
|
||||||
|
@ -35,6 +36,8 @@ final class PassphraseCredentialTransactionEditor
|
||||||
return $object->getSecretID();
|
return $object->getSecretID();
|
||||||
case PassphraseCredentialTransaction::TYPE_DESTROY:
|
case PassphraseCredentialTransaction::TYPE_DESTROY:
|
||||||
return $object->getIsDestroyed();
|
return $object->getIsDestroyed();
|
||||||
|
case PassphraseCredentialTransaction::TYPE_LOOKEDATSECRET:
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
return parent::getCustomTransactionOldValue($object, $xaction);
|
return parent::getCustomTransactionOldValue($object, $xaction);
|
||||||
|
@ -49,6 +52,7 @@ final class PassphraseCredentialTransactionEditor
|
||||||
case PassphraseCredentialTransaction::TYPE_USERNAME:
|
case PassphraseCredentialTransaction::TYPE_USERNAME:
|
||||||
case PassphraseCredentialTransaction::TYPE_SECRET_ID:
|
case PassphraseCredentialTransaction::TYPE_SECRET_ID:
|
||||||
case PassphraseCredentialTransaction::TYPE_DESTROY:
|
case PassphraseCredentialTransaction::TYPE_DESTROY:
|
||||||
|
case PassphraseCredentialTransaction::TYPE_LOOKEDATSECRET:
|
||||||
return $xaction->getNewValue();
|
return $xaction->getNewValue();
|
||||||
}
|
}
|
||||||
return parent::getCustomTransactionNewValue($object, $xaction);
|
return parent::getCustomTransactionNewValue($object, $xaction);
|
||||||
|
@ -92,6 +96,8 @@ final class PassphraseCredentialTransactionEditor
|
||||||
case PhabricatorTransactions::TYPE_EDIT_POLICY:
|
case PhabricatorTransactions::TYPE_EDIT_POLICY:
|
||||||
$object->setEditPolicy($xaction->getNewValue());
|
$object->setEditPolicy($xaction->getNewValue());
|
||||||
return;
|
return;
|
||||||
|
case PassphraseCredentialTransaction::TYPE_LOOKEDATSECRET:
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
return parent::applyCustomInternalTransaction($object, $xaction);
|
return parent::applyCustomInternalTransaction($object, $xaction);
|
||||||
|
@ -107,6 +113,7 @@ final class PassphraseCredentialTransactionEditor
|
||||||
case PassphraseCredentialTransaction::TYPE_USERNAME:
|
case PassphraseCredentialTransaction::TYPE_USERNAME:
|
||||||
case PassphraseCredentialTransaction::TYPE_SECRET_ID:
|
case PassphraseCredentialTransaction::TYPE_SECRET_ID:
|
||||||
case PassphraseCredentialTransaction::TYPE_DESTROY:
|
case PassphraseCredentialTransaction::TYPE_DESTROY:
|
||||||
|
case PassphraseCredentialTransaction::TYPE_LOOKEDATSECRET:
|
||||||
case PhabricatorTransactions::TYPE_VIEW_POLICY:
|
case PhabricatorTransactions::TYPE_VIEW_POLICY:
|
||||||
case PhabricatorTransactions::TYPE_EDIT_POLICY:
|
case PhabricatorTransactions::TYPE_EDIT_POLICY:
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -8,6 +8,7 @@ final class PassphraseCredentialTransaction
|
||||||
const TYPE_USERNAME = 'passphrase:username';
|
const TYPE_USERNAME = 'passphrase:username';
|
||||||
const TYPE_SECRET_ID = 'passphrase:secretID';
|
const TYPE_SECRET_ID = 'passphrase:secretID';
|
||||||
const TYPE_DESTROY = 'passphrase:destroy';
|
const TYPE_DESTROY = 'passphrase:destroy';
|
||||||
|
const TYPE_LOOKEDATSECRET = 'passphrase:lookedAtSecret';
|
||||||
|
|
||||||
public function getApplicationName() {
|
public function getApplicationName() {
|
||||||
return 'passphrase';
|
return 'passphrase';
|
||||||
|
@ -28,6 +29,8 @@ final class PassphraseCredentialTransaction
|
||||||
return ($old === null);
|
return ($old === null);
|
||||||
case self::TYPE_USERNAME:
|
case self::TYPE_USERNAME:
|
||||||
return !strlen($old);
|
return !strlen($old);
|
||||||
|
case self::TYPE_LOOKEDATSECRET:
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
return parent::shouldHide();
|
return parent::shouldHide();
|
||||||
}
|
}
|
||||||
|
@ -77,6 +80,10 @@ final class PassphraseCredentialTransaction
|
||||||
return pht(
|
return pht(
|
||||||
'%s destroyed this credential.',
|
'%s destroyed this credential.',
|
||||||
$this->renderHandleLink($author_phid));
|
$this->renderHandleLink($author_phid));
|
||||||
|
case self::TYPE_LOOKEDATSECRET:
|
||||||
|
return pht(
|
||||||
|
'%s examined the secret plaintext for this credential.',
|
||||||
|
$this->renderHandleLink($author_phid));
|
||||||
}
|
}
|
||||||
|
|
||||||
return parent::getTitle();
|
return parent::getTitle();
|
||||||
|
@ -97,5 +104,4 @@ final class PassphraseCredentialTransaction
|
||||||
json_encode($this->getNewValue()));
|
json_encode($this->getNewValue()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue