Page MenuHomePhabricator
Files F18225831

D15475.id.diff
No OneTemporary
Actions

D15475.id.diff
View Options

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1816,6 +1816,8 @@
'PhabricatorAuthNewController' => 'applications/auth/controller/config/PhabricatorAuthNewController.php',
'PhabricatorAuthOldOAuthRedirectController' => 'applications/auth/controller/PhabricatorAuthOldOAuthRedirectController.php',
'PhabricatorAuthOneTimeLoginController' => 'applications/auth/controller/PhabricatorAuthOneTimeLoginController.php',
+ 'PhabricatorAuthOneTimeLoginTemporaryTokenType' => 'applications/auth/tokentype/PhabricatorAuthOneTimeLoginTemporaryTokenType.php',
+ 'PhabricatorAuthPasswordResetTemporaryTokenType' => 'applications/auth/tokentype/PhabricatorAuthPasswordResetTemporaryTokenType.php',
'PhabricatorAuthProvider' => 'applications/auth/provider/PhabricatorAuthProvider.php',
'PhabricatorAuthProviderConfig' => 'applications/auth/storage/PhabricatorAuthProviderConfig.php',
'PhabricatorAuthProviderConfigController' => 'applications/auth/controller/config/PhabricatorAuthProviderConfigController.php',
@@ -1844,6 +1846,7 @@
'PhabricatorAuthTemporaryToken' => 'applications/auth/storage/PhabricatorAuthTemporaryToken.php',
'PhabricatorAuthTemporaryTokenGarbageCollector' => 'applications/auth/garbagecollector/PhabricatorAuthTemporaryTokenGarbageCollector.php',
'PhabricatorAuthTemporaryTokenQuery' => 'applications/auth/query/PhabricatorAuthTemporaryTokenQuery.php',
+ 'PhabricatorAuthTemporaryTokenType' => 'applications/auth/tokentype/PhabricatorAuthTemporaryTokenType.php',
'PhabricatorAuthTerminateSessionController' => 'applications/auth/controller/PhabricatorAuthTerminateSessionController.php',
'PhabricatorAuthTryFactorAction' => 'applications/auth/action/PhabricatorAuthTryFactorAction.php',
'PhabricatorAuthUnlinkController' => 'applications/auth/controller/PhabricatorAuthUnlinkController.php',
@@ -6123,6 +6126,8 @@
'PhabricatorAuthNewController' => 'PhabricatorAuthProviderConfigController',
'PhabricatorAuthOldOAuthRedirectController' => 'PhabricatorAuthController',
'PhabricatorAuthOneTimeLoginController' => 'PhabricatorAuthController',
+ 'PhabricatorAuthOneTimeLoginTemporaryTokenType' => 'PhabricatorAuthTemporaryTokenType',
+ 'PhabricatorAuthPasswordResetTemporaryTokenType' => 'PhabricatorAuthTemporaryTokenType',
'PhabricatorAuthProvider' => 'Phobject',
'PhabricatorAuthProviderConfig' => array(
'PhabricatorAuthDAO',
@@ -6165,6 +6170,7 @@
),
'PhabricatorAuthTemporaryTokenGarbageCollector' => 'PhabricatorGarbageCollector',
'PhabricatorAuthTemporaryTokenQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
+ 'PhabricatorAuthTemporaryTokenType' => 'Phobject',
'PhabricatorAuthTerminateSessionController' => 'PhabricatorAuthController',
'PhabricatorAuthTryFactorAction' => 'PhabricatorSystemAction',
'PhabricatorAuthUnlinkController' => 'PhabricatorAuthController',
diff --git a/src/applications/auth/storage/PhabricatorAuthTemporaryToken.php b/src/applications/auth/storage/PhabricatorAuthTemporaryToken.php
--- a/src/applications/auth/storage/PhabricatorAuthTemporaryToken.php
+++ b/src/applications/auth/storage/PhabricatorAuthTemporaryToken.php
@@ -31,14 +31,21 @@
) + parent::getConfiguration();
}
+ private function newTokenTypeImplementation() {
+ $types = PhabricatorAuthTemporaryTokenType::getAllTypes();
+
+ $type = idx($types, $this->tokenType);
+ if ($type) {
+ return clone $type;
+ }
+
+ return null;
+ }
+
public function getTokenReadableTypeName() {
- // Eventually, it would be nice to let applications implement token types
- // so we can put this in modular subclasses.
- switch ($this->tokenType) {
- case PhabricatorAuthSessionEngine::ONETIME_TEMPORARY_TOKEN_TYPE:
- return pht('One-Time Login Token');
- case PhabricatorAuthSessionEngine::PASSWORD_TEMPORARY_TOKEN_TYPE:
- return pht('Password Reset Token');
+ $type = $this->newTokenTypeImplementation();
+ if ($type) {
+ return $type->getTokenReadableTypeName($this);
}
return $this->tokenType;
@@ -49,10 +56,9 @@
return false;
}
- switch ($this->tokenType) {
- case PhabricatorAuthSessionEngine::ONETIME_TEMPORARY_TOKEN_TYPE:
- case PhabricatorAuthSessionEngine::PASSWORD_TEMPORARY_TOKEN_TYPE:
- return true;
+ $type = $this->newTokenTypeImplementation();
+ if ($type) {
+ return $type->isTokenRevocable($this);
}
return false;
diff --git a/src/applications/auth/tokentype/PhabricatorAuthOneTimeLoginTemporaryTokenType.php b/src/applications/auth/tokentype/PhabricatorAuthOneTimeLoginTemporaryTokenType.php
new file mode 100644
--- /dev/null
+++ b/src/applications/auth/tokentype/PhabricatorAuthOneTimeLoginTemporaryTokenType.php
@@ -0,0 +1,17 @@
+<?php
+
+final class PhabricatorAuthOneTimeLoginTemporaryTokenType
+ extends PhabricatorAuthTemporaryTokenType {
+
+ const TOKENTYPE = 'login:onetime';
+
+ public function getTokenReadableTypeName(
+ PhabricatorAuthTemporaryToken $token) {
+ return pht('One-Time Login Token');
+ }
+
+ public function isTokenRevocable(PhabricatorAuthTemporaryToken $token) {
+ return true;
+ }
+
+}
diff --git a/src/applications/auth/tokentype/PhabricatorAuthPasswordResetTemporaryTokenType.php b/src/applications/auth/tokentype/PhabricatorAuthPasswordResetTemporaryTokenType.php
new file mode 100644
--- /dev/null
+++ b/src/applications/auth/tokentype/PhabricatorAuthPasswordResetTemporaryTokenType.php
@@ -0,0 +1,17 @@
+<?php
+
+final class PhabricatorAuthPasswordResetTemporaryTokenType
+ extends PhabricatorAuthTemporaryTokenType {
+
+ const TOKENTYPE = 'login:password';
+
+ public function getTokenReadableTypeName(
+ PhabricatorAuthTemporaryToken $token) {
+ return pht('Password Reset Token');
+ }
+
+ public function isTokenRevocable(PhabricatorAuthTemporaryToken $token) {
+ return true;
+ }
+
+}
diff --git a/src/applications/auth/tokentype/PhabricatorAuthTemporaryTokenType.php b/src/applications/auth/tokentype/PhabricatorAuthTemporaryTokenType.php
new file mode 100644
--- /dev/null
+++ b/src/applications/auth/tokentype/PhabricatorAuthTemporaryTokenType.php
@@ -0,0 +1,24 @@
+<?php
+
+abstract class PhabricatorAuthTemporaryTokenType
+ extends Phobject {
+
+ abstract public function getTokenReadableTypeName(
+ PhabricatorAuthTemporaryToken $token);
+
+ public function isTokenRevocable(PhabricatorAuthTemporaryToken $token) {
+ return false;
+ }
+
+ final public function getTokenTypeConstant() {
+ return $this->getPhobjectClassConstant('TOKENTYPE', 64);
+ }
+
+ final public static function getAllTypes() {
+ return id(new PhutilClassMapQuery())
+ ->setAncestorClass(__CLASS__)
+ ->setUniqueMethod('getTokenTypeConstant')
+ ->execute();
+ }
+
+}

File Metadata

Mime Type
text/plain
Expires
Aug 21 2025, 2:36 AM (8 w, 5 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
9643469
Default Alt Text
D15475.id.diff (6 KB)

Event Timeline

Phabricator · Built by Phacility