@@ -38,52 +38,52 @@ |
||
38 | 38 | */ |
39 | 39 | class UserProvided extends AuthMechanism implements IUserProvided { |
40 | 40 | |
41 | - const CREDENTIALS_IDENTIFIER_PREFIX = 'password::userprovided/'; |
|
41 | + const CREDENTIALS_IDENTIFIER_PREFIX = 'password::userprovided/'; |
|
42 | 42 | |
43 | - /** @var ICredentialsManager */ |
|
44 | - protected $credentialsManager; |
|
43 | + /** @var ICredentialsManager */ |
|
44 | + protected $credentialsManager; |
|
45 | 45 | |
46 | - public function __construct(IL10N $l, ICredentialsManager $credentialsManager) { |
|
47 | - $this->credentialsManager = $credentialsManager; |
|
46 | + public function __construct(IL10N $l, ICredentialsManager $credentialsManager) { |
|
47 | + $this->credentialsManager = $credentialsManager; |
|
48 | 48 | |
49 | - $this |
|
50 | - ->setIdentifier('password::userprovided') |
|
51 | - ->setVisibility(BackendService::VISIBILITY_ADMIN) |
|
52 | - ->setScheme(self::SCHEME_PASSWORD) |
|
53 | - ->setText($l->t('User entered, store in database')) |
|
54 | - ->addParameters([ |
|
55 | - (new DefinitionParameter('user', $l->t('Username'))) |
|
56 | - ->setFlag(DefinitionParameter::FLAG_USER_PROVIDED), |
|
57 | - (new DefinitionParameter('password', $l->t('Password'))) |
|
58 | - ->setType(DefinitionParameter::VALUE_PASSWORD) |
|
59 | - ->setFlag(DefinitionParameter::FLAG_USER_PROVIDED), |
|
60 | - ]); |
|
61 | - } |
|
49 | + $this |
|
50 | + ->setIdentifier('password::userprovided') |
|
51 | + ->setVisibility(BackendService::VISIBILITY_ADMIN) |
|
52 | + ->setScheme(self::SCHEME_PASSWORD) |
|
53 | + ->setText($l->t('User entered, store in database')) |
|
54 | + ->addParameters([ |
|
55 | + (new DefinitionParameter('user', $l->t('Username'))) |
|
56 | + ->setFlag(DefinitionParameter::FLAG_USER_PROVIDED), |
|
57 | + (new DefinitionParameter('password', $l->t('Password'))) |
|
58 | + ->setType(DefinitionParameter::VALUE_PASSWORD) |
|
59 | + ->setFlag(DefinitionParameter::FLAG_USER_PROVIDED), |
|
60 | + ]); |
|
61 | + } |
|
62 | 62 | |
63 | - private function getCredentialsIdentifier($storageId) { |
|
64 | - return self::CREDENTIALS_IDENTIFIER_PREFIX . $storageId; |
|
65 | - } |
|
63 | + private function getCredentialsIdentifier($storageId) { |
|
64 | + return self::CREDENTIALS_IDENTIFIER_PREFIX . $storageId; |
|
65 | + } |
|
66 | 66 | |
67 | - public function saveBackendOptions(IUser $user, $id, array $options) { |
|
68 | - $this->credentialsManager->store($user->getUID(), $this->getCredentialsIdentifier($id), [ |
|
69 | - 'user' => $options['user'], // explicitly copy the fields we want instead of just passing the entire $options array |
|
70 | - 'password' => $options['password'] // this way we prevent users from being able to modify any other field |
|
71 | - ]); |
|
72 | - } |
|
67 | + public function saveBackendOptions(IUser $user, $id, array $options) { |
|
68 | + $this->credentialsManager->store($user->getUID(), $this->getCredentialsIdentifier($id), [ |
|
69 | + 'user' => $options['user'], // explicitly copy the fields we want instead of just passing the entire $options array |
|
70 | + 'password' => $options['password'] // this way we prevent users from being able to modify any other field |
|
71 | + ]); |
|
72 | + } |
|
73 | 73 | |
74 | - public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
|
75 | - if (!isset($user)) { |
|
76 | - throw new InsufficientDataForMeaningfulAnswerException('No credentials saved'); |
|
77 | - } |
|
78 | - $uid = $user->getUID(); |
|
79 | - $credentials = $this->credentialsManager->retrieve($uid, $this->getCredentialsIdentifier($storage->getId())); |
|
74 | + public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
|
75 | + if (!isset($user)) { |
|
76 | + throw new InsufficientDataForMeaningfulAnswerException('No credentials saved'); |
|
77 | + } |
|
78 | + $uid = $user->getUID(); |
|
79 | + $credentials = $this->credentialsManager->retrieve($uid, $this->getCredentialsIdentifier($storage->getId())); |
|
80 | 80 | |
81 | - if (!isset($credentials)) { |
|
82 | - throw new InsufficientDataForMeaningfulAnswerException('No credentials saved'); |
|
83 | - } |
|
81 | + if (!isset($credentials)) { |
|
82 | + throw new InsufficientDataForMeaningfulAnswerException('No credentials saved'); |
|
83 | + } |
|
84 | 84 | |
85 | - $storage->setBackendOption('user', $credentials['user']); |
|
86 | - $storage->setBackendOption('password', $credentials['password']); |
|
87 | - } |
|
85 | + $storage->setBackendOption('user', $credentials['user']); |
|
86 | + $storage->setBackendOption('password', $credentials['password']); |
|
87 | + } |
|
88 | 88 | |
89 | 89 | } |
@@ -61,7 +61,7 @@ |
||
61 | 61 | } |
62 | 62 | |
63 | 63 | private function getCredentialsIdentifier($storageId) { |
64 | - return self::CREDENTIALS_IDENTIFIER_PREFIX . $storageId; |
|
64 | + return self::CREDENTIALS_IDENTIFIER_PREFIX.$storageId; |
|
65 | 65 | } |
66 | 66 | |
67 | 67 | public function saveBackendOptions(IUser $user, $id, array $options) { |
@@ -36,54 +36,54 @@ |
||
36 | 36 | */ |
37 | 37 | class GlobalAuth extends AuthMechanism { |
38 | 38 | |
39 | - const CREDENTIALS_IDENTIFIER = 'password::global'; |
|
39 | + const CREDENTIALS_IDENTIFIER = 'password::global'; |
|
40 | 40 | |
41 | - /** @var ICredentialsManager */ |
|
42 | - protected $credentialsManager; |
|
41 | + /** @var ICredentialsManager */ |
|
42 | + protected $credentialsManager; |
|
43 | 43 | |
44 | - public function __construct(IL10N $l, ICredentialsManager $credentialsManager) { |
|
45 | - $this->credentialsManager = $credentialsManager; |
|
44 | + public function __construct(IL10N $l, ICredentialsManager $credentialsManager) { |
|
45 | + $this->credentialsManager = $credentialsManager; |
|
46 | 46 | |
47 | - $this |
|
48 | - ->setIdentifier('password::global') |
|
49 | - ->setVisibility(BackendService::VISIBILITY_DEFAULT) |
|
50 | - ->setScheme(self::SCHEME_PASSWORD) |
|
51 | - ->setText($l->t('Global credentials')); |
|
52 | - } |
|
47 | + $this |
|
48 | + ->setIdentifier('password::global') |
|
49 | + ->setVisibility(BackendService::VISIBILITY_DEFAULT) |
|
50 | + ->setScheme(self::SCHEME_PASSWORD) |
|
51 | + ->setText($l->t('Global credentials')); |
|
52 | + } |
|
53 | 53 | |
54 | - public function getAuth($uid) { |
|
55 | - $auth = $this->credentialsManager->retrieve($uid, self::CREDENTIALS_IDENTIFIER); |
|
56 | - if (!is_array($auth)) { |
|
57 | - return [ |
|
58 | - 'user' => '', |
|
59 | - 'password' => '' |
|
60 | - ]; |
|
61 | - } else { |
|
62 | - return $auth; |
|
63 | - } |
|
64 | - } |
|
54 | + public function getAuth($uid) { |
|
55 | + $auth = $this->credentialsManager->retrieve($uid, self::CREDENTIALS_IDENTIFIER); |
|
56 | + if (!is_array($auth)) { |
|
57 | + return [ |
|
58 | + 'user' => '', |
|
59 | + 'password' => '' |
|
60 | + ]; |
|
61 | + } else { |
|
62 | + return $auth; |
|
63 | + } |
|
64 | + } |
|
65 | 65 | |
66 | - public function saveAuth($uid, $user, $password) { |
|
67 | - $this->credentialsManager->store($uid, self::CREDENTIALS_IDENTIFIER, [ |
|
68 | - 'user' => $user, |
|
69 | - 'password' => $password |
|
70 | - ]); |
|
71 | - } |
|
66 | + public function saveAuth($uid, $user, $password) { |
|
67 | + $this->credentialsManager->store($uid, self::CREDENTIALS_IDENTIFIER, [ |
|
68 | + 'user' => $user, |
|
69 | + 'password' => $password |
|
70 | + ]); |
|
71 | + } |
|
72 | 72 | |
73 | - public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
|
74 | - if ($storage->getType() === StorageConfig::MOUNT_TYPE_ADMIN) { |
|
75 | - $uid = ''; |
|
76 | - } elseif (is_null($user)) { |
|
77 | - throw new InsufficientDataForMeaningfulAnswerException('No credentials saved'); |
|
78 | - } else { |
|
79 | - $uid = $user->getUID(); |
|
80 | - } |
|
81 | - $credentials = $this->credentialsManager->retrieve($uid, self::CREDENTIALS_IDENTIFIER); |
|
73 | + public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
|
74 | + if ($storage->getType() === StorageConfig::MOUNT_TYPE_ADMIN) { |
|
75 | + $uid = ''; |
|
76 | + } elseif (is_null($user)) { |
|
77 | + throw new InsufficientDataForMeaningfulAnswerException('No credentials saved'); |
|
78 | + } else { |
|
79 | + $uid = $user->getUID(); |
|
80 | + } |
|
81 | + $credentials = $this->credentialsManager->retrieve($uid, self::CREDENTIALS_IDENTIFIER); |
|
82 | 82 | |
83 | - if (is_array($credentials)) { |
|
84 | - $storage->setBackendOption('user', $credentials['user']); |
|
85 | - $storage->setBackendOption('password', $credentials['password']); |
|
86 | - } |
|
87 | - } |
|
83 | + if (is_array($credentials)) { |
|
84 | + $storage->setBackendOption('user', $credentials['user']); |
|
85 | + $storage->setBackendOption('password', $credentials['password']); |
|
86 | + } |
|
87 | + } |
|
88 | 88 | |
89 | 89 | } |
@@ -31,24 +31,24 @@ |
||
31 | 31 | */ |
32 | 32 | class OAuth1 extends AuthMechanism { |
33 | 33 | |
34 | - public function __construct(IL10N $l) { |
|
35 | - $this |
|
36 | - ->setIdentifier('oauth1::oauth1') |
|
37 | - ->setScheme(self::SCHEME_OAUTH1) |
|
38 | - ->setText($l->t('OAuth1')) |
|
39 | - ->addParameters([ |
|
40 | - (new DefinitionParameter('configured', 'configured')) |
|
41 | - ->setType(DefinitionParameter::VALUE_HIDDEN), |
|
42 | - (new DefinitionParameter('app_key', $l->t('App key'))), |
|
43 | - (new DefinitionParameter('app_secret', $l->t('App secret'))) |
|
44 | - ->setType(DefinitionParameter::VALUE_PASSWORD), |
|
45 | - (new DefinitionParameter('token', 'token')) |
|
46 | - ->setType(DefinitionParameter::VALUE_HIDDEN), |
|
47 | - (new DefinitionParameter('token_secret', 'token_secret')) |
|
48 | - ->setType(DefinitionParameter::VALUE_HIDDEN), |
|
49 | - ]) |
|
50 | - ->addCustomJs('oauth1') |
|
51 | - ; |
|
52 | - } |
|
34 | + public function __construct(IL10N $l) { |
|
35 | + $this |
|
36 | + ->setIdentifier('oauth1::oauth1') |
|
37 | + ->setScheme(self::SCHEME_OAUTH1) |
|
38 | + ->setText($l->t('OAuth1')) |
|
39 | + ->addParameters([ |
|
40 | + (new DefinitionParameter('configured', 'configured')) |
|
41 | + ->setType(DefinitionParameter::VALUE_HIDDEN), |
|
42 | + (new DefinitionParameter('app_key', $l->t('App key'))), |
|
43 | + (new DefinitionParameter('app_secret', $l->t('App secret'))) |
|
44 | + ->setType(DefinitionParameter::VALUE_PASSWORD), |
|
45 | + (new DefinitionParameter('token', 'token')) |
|
46 | + ->setType(DefinitionParameter::VALUE_HIDDEN), |
|
47 | + (new DefinitionParameter('token_secret', 'token_secret')) |
|
48 | + ->setType(DefinitionParameter::VALUE_HIDDEN), |
|
49 | + ]) |
|
50 | + ->addCustomJs('oauth1') |
|
51 | + ; |
|
52 | + } |
|
53 | 53 | |
54 | 54 | } |
@@ -31,22 +31,22 @@ |
||
31 | 31 | */ |
32 | 32 | class OAuth2 extends AuthMechanism { |
33 | 33 | |
34 | - public function __construct(IL10N $l) { |
|
35 | - $this |
|
36 | - ->setIdentifier('oauth2::oauth2') |
|
37 | - ->setScheme(self::SCHEME_OAUTH2) |
|
38 | - ->setText($l->t('OAuth2')) |
|
39 | - ->addParameters([ |
|
40 | - (new DefinitionParameter('configured', 'configured')) |
|
41 | - ->setType(DefinitionParameter::VALUE_HIDDEN), |
|
42 | - (new DefinitionParameter('client_id', $l->t('Client ID'))), |
|
43 | - (new DefinitionParameter('client_secret', $l->t('Client secret'))) |
|
44 | - ->setType(DefinitionParameter::VALUE_PASSWORD), |
|
45 | - (new DefinitionParameter('token', 'token')) |
|
46 | - ->setType(DefinitionParameter::VALUE_HIDDEN), |
|
47 | - ]) |
|
48 | - ->addCustomJs('oauth2') |
|
49 | - ; |
|
50 | - } |
|
34 | + public function __construct(IL10N $l) { |
|
35 | + $this |
|
36 | + ->setIdentifier('oauth2::oauth2') |
|
37 | + ->setScheme(self::SCHEME_OAUTH2) |
|
38 | + ->setText($l->t('OAuth2')) |
|
39 | + ->addParameters([ |
|
40 | + (new DefinitionParameter('configured', 'configured')) |
|
41 | + ->setType(DefinitionParameter::VALUE_HIDDEN), |
|
42 | + (new DefinitionParameter('client_id', $l->t('Client ID'))), |
|
43 | + (new DefinitionParameter('client_secret', $l->t('Client secret'))) |
|
44 | + ->setType(DefinitionParameter::VALUE_PASSWORD), |
|
45 | + (new DefinitionParameter('token', 'token')) |
|
46 | + ->setType(DefinitionParameter::VALUE_HIDDEN), |
|
47 | + ]) |
|
48 | + ->addCustomJs('oauth2') |
|
49 | + ; |
|
50 | + } |
|
51 | 51 | |
52 | 52 | } |
@@ -28,10 +28,10 @@ |
||
28 | 28 | * For auth mechanisms where the user needs to provide credentials |
29 | 29 | */ |
30 | 30 | interface IUserProvided { |
31 | - /** |
|
32 | - * @param IUser $user the user for which to save the user provided options |
|
33 | - * @param int $mountId the mount id to save the options for |
|
34 | - * @param array $options the user provided options |
|
35 | - */ |
|
36 | - public function saveBackendOptions(IUser $user, $mountId, array $options); |
|
31 | + /** |
|
32 | + * @param IUser $user the user for which to save the user provided options |
|
33 | + * @param int $mountId the mount id to save the options for |
|
34 | + * @param array $options the user provided options |
|
35 | + */ |
|
36 | + public function saveBackendOptions(IUser $user, $mountId, array $options); |
|
37 | 37 | } |
@@ -31,17 +31,17 @@ |
||
31 | 31 | */ |
32 | 32 | class Rackspace extends AuthMechanism { |
33 | 33 | |
34 | - public function __construct(IL10N $l) { |
|
35 | - $this |
|
36 | - ->setIdentifier('openstack::rackspace') |
|
37 | - ->setScheme(self::SCHEME_OPENSTACK) |
|
38 | - ->setText($l->t('Rackspace')) |
|
39 | - ->addParameters([ |
|
40 | - (new DefinitionParameter('user', $l->t('Username'))), |
|
41 | - (new DefinitionParameter('key', $l->t('API key'))) |
|
42 | - ->setType(DefinitionParameter::VALUE_PASSWORD), |
|
43 | - ]) |
|
44 | - ; |
|
45 | - } |
|
34 | + public function __construct(IL10N $l) { |
|
35 | + $this |
|
36 | + ->setIdentifier('openstack::rackspace') |
|
37 | + ->setScheme(self::SCHEME_OPENSTACK) |
|
38 | + ->setText($l->t('Rackspace')) |
|
39 | + ->addParameters([ |
|
40 | + (new DefinitionParameter('user', $l->t('Username'))), |
|
41 | + (new DefinitionParameter('key', $l->t('API key'))) |
|
42 | + ->setType(DefinitionParameter::VALUE_PASSWORD), |
|
43 | + ]) |
|
44 | + ; |
|
45 | + } |
|
46 | 46 | |
47 | 47 | } |
@@ -31,19 +31,19 @@ |
||
31 | 31 | */ |
32 | 32 | class OpenStack extends AuthMechanism { |
33 | 33 | |
34 | - public function __construct(IL10N $l) { |
|
35 | - $this |
|
36 | - ->setIdentifier('openstack::openstack') |
|
37 | - ->setScheme(self::SCHEME_OPENSTACK) |
|
38 | - ->setText($l->t('OpenStack')) |
|
39 | - ->addParameters([ |
|
40 | - (new DefinitionParameter('user', $l->t('Username'))), |
|
41 | - (new DefinitionParameter('password', $l->t('Password'))) |
|
42 | - ->setType(DefinitionParameter::VALUE_PASSWORD), |
|
43 | - (new DefinitionParameter('tenant', $l->t('Tenant name'))), |
|
44 | - (new DefinitionParameter('url', $l->t('Identity endpoint URL'))), |
|
45 | - ]) |
|
46 | - ; |
|
47 | - } |
|
34 | + public function __construct(IL10N $l) { |
|
35 | + $this |
|
36 | + ->setIdentifier('openstack::openstack') |
|
37 | + ->setScheme(self::SCHEME_OPENSTACK) |
|
38 | + ->setText($l->t('OpenStack')) |
|
39 | + ->addParameters([ |
|
40 | + (new DefinitionParameter('user', $l->t('Username'))), |
|
41 | + (new DefinitionParameter('password', $l->t('Password'))) |
|
42 | + ->setType(DefinitionParameter::VALUE_PASSWORD), |
|
43 | + (new DefinitionParameter('tenant', $l->t('Tenant name'))), |
|
44 | + (new DefinitionParameter('url', $l->t('Identity endpoint URL'))), |
|
45 | + ]) |
|
46 | + ; |
|
47 | + } |
|
48 | 48 | |
49 | 49 | } |
@@ -35,48 +35,48 @@ |
||
35 | 35 | */ |
36 | 36 | class RSA extends AuthMechanism { |
37 | 37 | |
38 | - const CREATE_KEY_BITS = 1024; |
|
38 | + const CREATE_KEY_BITS = 1024; |
|
39 | 39 | |
40 | - /** @var IConfig */ |
|
41 | - private $config; |
|
40 | + /** @var IConfig */ |
|
41 | + private $config; |
|
42 | 42 | |
43 | - public function __construct(IL10N $l, IConfig $config) { |
|
44 | - $this->config = $config; |
|
43 | + public function __construct(IL10N $l, IConfig $config) { |
|
44 | + $this->config = $config; |
|
45 | 45 | |
46 | - $this |
|
47 | - ->setIdentifier('publickey::rsa') |
|
48 | - ->setScheme(self::SCHEME_PUBLICKEY) |
|
49 | - ->setText($l->t('RSA public key')) |
|
50 | - ->addParameters([ |
|
51 | - (new DefinitionParameter('user', $l->t('Username'))), |
|
52 | - (new DefinitionParameter('public_key', $l->t('Public key'))), |
|
53 | - (new DefinitionParameter('private_key', 'private_key')) |
|
54 | - ->setType(DefinitionParameter::VALUE_HIDDEN), |
|
55 | - ]) |
|
56 | - ->addCustomJs('public_key') |
|
57 | - ; |
|
58 | - } |
|
46 | + $this |
|
47 | + ->setIdentifier('publickey::rsa') |
|
48 | + ->setScheme(self::SCHEME_PUBLICKEY) |
|
49 | + ->setText($l->t('RSA public key')) |
|
50 | + ->addParameters([ |
|
51 | + (new DefinitionParameter('user', $l->t('Username'))), |
|
52 | + (new DefinitionParameter('public_key', $l->t('Public key'))), |
|
53 | + (new DefinitionParameter('private_key', 'private_key')) |
|
54 | + ->setType(DefinitionParameter::VALUE_HIDDEN), |
|
55 | + ]) |
|
56 | + ->addCustomJs('public_key') |
|
57 | + ; |
|
58 | + } |
|
59 | 59 | |
60 | - public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
|
61 | - $auth = new RSACrypt(); |
|
62 | - $auth->setPassword($this->config->getSystemValue('secret', '')); |
|
63 | - if (!$auth->loadKey($storage->getBackendOption('private_key'))) { |
|
64 | - throw new \RuntimeException('unable to load private key'); |
|
65 | - } |
|
66 | - $storage->setBackendOption('public_key_auth', $auth); |
|
67 | - } |
|
60 | + public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
|
61 | + $auth = new RSACrypt(); |
|
62 | + $auth->setPassword($this->config->getSystemValue('secret', '')); |
|
63 | + if (!$auth->loadKey($storage->getBackendOption('private_key'))) { |
|
64 | + throw new \RuntimeException('unable to load private key'); |
|
65 | + } |
|
66 | + $storage->setBackendOption('public_key_auth', $auth); |
|
67 | + } |
|
68 | 68 | |
69 | - /** |
|
70 | - * Generate a keypair |
|
71 | - * |
|
72 | - * @return array ['privatekey' => $privateKey, 'publickey' => $publicKey] |
|
73 | - */ |
|
74 | - public function createKey() { |
|
75 | - $rsa = new RSACrypt(); |
|
76 | - $rsa->setPublicKeyFormat(RSACrypt::PUBLIC_FORMAT_OPENSSH); |
|
77 | - $rsa->setPassword($this->config->getSystemValue('secret', '')); |
|
69 | + /** |
|
70 | + * Generate a keypair |
|
71 | + * |
|
72 | + * @return array ['privatekey' => $privateKey, 'publickey' => $publicKey] |
|
73 | + */ |
|
74 | + public function createKey() { |
|
75 | + $rsa = new RSACrypt(); |
|
76 | + $rsa->setPublicKeyFormat(RSACrypt::PUBLIC_FORMAT_OPENSSH); |
|
77 | + $rsa->setPassword($this->config->getSystemValue('secret', '')); |
|
78 | 78 | |
79 | - return $rsa->createKey(self::CREATE_KEY_BITS); |
|
80 | - } |
|
79 | + return $rsa->createKey(self::CREATE_KEY_BITS); |
|
80 | + } |
|
81 | 81 | |
82 | 82 | } |
@@ -29,12 +29,12 @@ |
||
29 | 29 | */ |
30 | 30 | class Builtin extends AuthMechanism { |
31 | 31 | |
32 | - public function __construct(IL10N $l) { |
|
33 | - $this |
|
34 | - ->setIdentifier('builtin::builtin') |
|
35 | - ->setScheme(self::SCHEME_BUILTIN) |
|
36 | - ->setText($l->t('Builtin')) |
|
37 | - ; |
|
38 | - } |
|
32 | + public function __construct(IL10N $l) { |
|
33 | + $this |
|
34 | + ->setIdentifier('builtin::builtin') |
|
35 | + ->setScheme(self::SCHEME_BUILTIN) |
|
36 | + ->setText($l->t('Builtin')) |
|
37 | + ; |
|
38 | + } |
|
39 | 39 | |
40 | 40 | } |