@@ -40,44 +40,44 @@ |
||
40 | 40 | * @since 6.0.0 |
41 | 41 | */ |
42 | 42 | interface IUserSession { |
43 | - /** |
|
44 | - * Do a user login |
|
45 | - * @param string $user the username |
|
46 | - * @param string $password the password |
|
47 | - * @return bool true if successful |
|
48 | - * @since 6.0.0 |
|
49 | - */ |
|
50 | - public function login($user, $password); |
|
43 | + /** |
|
44 | + * Do a user login |
|
45 | + * @param string $user the username |
|
46 | + * @param string $password the password |
|
47 | + * @return bool true if successful |
|
48 | + * @since 6.0.0 |
|
49 | + */ |
|
50 | + public function login($user, $password); |
|
51 | 51 | |
52 | - /** |
|
53 | - * Logs the user out including all the session data |
|
54 | - * Logout, destroys session |
|
55 | - * @return void |
|
56 | - * @since 6.0.0 |
|
57 | - */ |
|
58 | - public function logout(); |
|
52 | + /** |
|
53 | + * Logs the user out including all the session data |
|
54 | + * Logout, destroys session |
|
55 | + * @return void |
|
56 | + * @since 6.0.0 |
|
57 | + */ |
|
58 | + public function logout(); |
|
59 | 59 | |
60 | - /** |
|
61 | - * set the currently active user |
|
62 | - * |
|
63 | - * @param \OCP\IUser|null $user |
|
64 | - * @since 8.0.0 |
|
65 | - */ |
|
66 | - public function setUser($user); |
|
60 | + /** |
|
61 | + * set the currently active user |
|
62 | + * |
|
63 | + * @param \OCP\IUser|null $user |
|
64 | + * @since 8.0.0 |
|
65 | + */ |
|
66 | + public function setUser($user); |
|
67 | 67 | |
68 | - /** |
|
69 | - * get the current active user |
|
70 | - * |
|
71 | - * @return \OCP\IUser|null Current user, otherwise null |
|
72 | - * @since 8.0.0 |
|
73 | - */ |
|
74 | - public function getUser(); |
|
68 | + /** |
|
69 | + * get the current active user |
|
70 | + * |
|
71 | + * @return \OCP\IUser|null Current user, otherwise null |
|
72 | + * @since 8.0.0 |
|
73 | + */ |
|
74 | + public function getUser(); |
|
75 | 75 | |
76 | - /** |
|
77 | - * Checks whether the user is logged in |
|
78 | - * |
|
79 | - * @return bool if logged in |
|
80 | - * @since 8.0.0 |
|
81 | - */ |
|
82 | - public function isLoggedIn(); |
|
76 | + /** |
|
77 | + * Checks whether the user is logged in |
|
78 | + * |
|
79 | + * @return bool if logged in |
|
80 | + * @since 8.0.0 |
|
81 | + */ |
|
82 | + public function isLoggedIn(); |
|
83 | 83 | } |
@@ -30,10 +30,10 @@ |
||
30 | 30 | * @since 8.0.0 |
31 | 31 | */ |
32 | 32 | interface IDateTimeZone { |
33 | - /** |
|
34 | - * @param bool|int $timestamp |
|
35 | - * @return \DateTimeZone |
|
36 | - * @since 8.0.0 - parameter $timestamp was added in 8.1.0 |
|
37 | - */ |
|
38 | - public function getTimeZone($timestamp = false); |
|
33 | + /** |
|
34 | + * @param bool|int $timestamp |
|
35 | + * @return \DateTimeZone |
|
36 | + * @since 8.0.0 - parameter $timestamp was added in 8.1.0 |
|
37 | + */ |
|
38 | + public function getTimeZone($timestamp = false); |
|
39 | 39 | } |
@@ -31,18 +31,18 @@ |
||
31 | 31 | * @since 8.0.0 |
32 | 32 | */ |
33 | 33 | class StringUtils { |
34 | - /** |
|
35 | - * Compares whether two strings are equal. To prevent guessing of the string |
|
36 | - * length this is done by comparing two hashes against each other and afterwards |
|
37 | - * a comparison of the real string to prevent against the unlikely chance of |
|
38 | - * collisions. |
|
39 | - * @param string $expected The expected value |
|
40 | - * @param string $input The input to compare against |
|
41 | - * @return bool True if the two strings are equal, otherwise false. |
|
42 | - * @since 8.0.0 |
|
43 | - * @deprecated 9.0.0 Use hash_equals |
|
44 | - */ |
|
45 | - public static function equals($expected, $input) { |
|
46 | - return hash_equals($expected, $input); |
|
47 | - } |
|
34 | + /** |
|
35 | + * Compares whether two strings are equal. To prevent guessing of the string |
|
36 | + * length this is done by comparing two hashes against each other and afterwards |
|
37 | + * a comparison of the real string to prevent against the unlikely chance of |
|
38 | + * collisions. |
|
39 | + * @param string $expected The expected value |
|
40 | + * @param string $input The input to compare against |
|
41 | + * @return bool True if the two strings are equal, otherwise false. |
|
42 | + * @since 8.0.0 |
|
43 | + * @deprecated 9.0.0 Use hash_equals |
|
44 | + */ |
|
45 | + public static function equals($expected, $input) { |
|
46 | + return hash_equals($expected, $input); |
|
47 | + } |
|
48 | 48 | } |
@@ -30,43 +30,43 @@ |
||
30 | 30 | */ |
31 | 31 | interface ICredentialsManager { |
32 | 32 | |
33 | - /** |
|
34 | - * Store a set of credentials |
|
35 | - * |
|
36 | - * @param string|null $userId Null for system-wide credentials |
|
37 | - * @param string $identifier |
|
38 | - * @param mixed $credentials |
|
39 | - * @since 8.2.0 |
|
40 | - */ |
|
41 | - public function store($userId, $identifier, $credentials); |
|
33 | + /** |
|
34 | + * Store a set of credentials |
|
35 | + * |
|
36 | + * @param string|null $userId Null for system-wide credentials |
|
37 | + * @param string $identifier |
|
38 | + * @param mixed $credentials |
|
39 | + * @since 8.2.0 |
|
40 | + */ |
|
41 | + public function store($userId, $identifier, $credentials); |
|
42 | 42 | |
43 | - /** |
|
44 | - * Retrieve a set of credentials |
|
45 | - * |
|
46 | - * @param string|null $userId Null for system-wide credentials |
|
47 | - * @param string $identifier |
|
48 | - * @return mixed |
|
49 | - * @since 8.2.0 |
|
50 | - */ |
|
51 | - public function retrieve($userId, $identifier); |
|
43 | + /** |
|
44 | + * Retrieve a set of credentials |
|
45 | + * |
|
46 | + * @param string|null $userId Null for system-wide credentials |
|
47 | + * @param string $identifier |
|
48 | + * @return mixed |
|
49 | + * @since 8.2.0 |
|
50 | + */ |
|
51 | + public function retrieve($userId, $identifier); |
|
52 | 52 | |
53 | - /** |
|
54 | - * Delete a set of credentials |
|
55 | - * |
|
56 | - * @param string|null $userId Null for system-wide credentials |
|
57 | - * @param string $identifier |
|
58 | - * @return int rows removed |
|
59 | - * @since 8.2.0 |
|
60 | - */ |
|
61 | - public function delete($userId, $identifier); |
|
53 | + /** |
|
54 | + * Delete a set of credentials |
|
55 | + * |
|
56 | + * @param string|null $userId Null for system-wide credentials |
|
57 | + * @param string $identifier |
|
58 | + * @return int rows removed |
|
59 | + * @since 8.2.0 |
|
60 | + */ |
|
61 | + public function delete($userId, $identifier); |
|
62 | 62 | |
63 | - /** |
|
64 | - * Erase all credentials stored for a user |
|
65 | - * |
|
66 | - * @param string $userId |
|
67 | - * @return int rows removed |
|
68 | - * @since 8.2.0 |
|
69 | - */ |
|
70 | - public function erase($userId); |
|
63 | + /** |
|
64 | + * Erase all credentials stored for a user |
|
65 | + * |
|
66 | + * @param string $userId |
|
67 | + * @return int rows removed |
|
68 | + * @since 8.2.0 |
|
69 | + */ |
|
70 | + public function erase($userId); |
|
71 | 71 | |
72 | 72 | } |
@@ -44,23 +44,23 @@ |
||
44 | 44 | * @since 8.0.0 |
45 | 45 | */ |
46 | 46 | interface IHasher { |
47 | - /** |
|
48 | - * Hashes a message using PHP's `password_hash` functionality. |
|
49 | - * Please note that the size of the returned string is not guaranteed |
|
50 | - * and can be up to 255 characters. |
|
51 | - * |
|
52 | - * @param string $message Message to generate hash from |
|
53 | - * @return string Hash of the message with appended version parameter |
|
54 | - * @since 8.0.0 |
|
55 | - */ |
|
56 | - public function hash($message); |
|
47 | + /** |
|
48 | + * Hashes a message using PHP's `password_hash` functionality. |
|
49 | + * Please note that the size of the returned string is not guaranteed |
|
50 | + * and can be up to 255 characters. |
|
51 | + * |
|
52 | + * @param string $message Message to generate hash from |
|
53 | + * @return string Hash of the message with appended version parameter |
|
54 | + * @since 8.0.0 |
|
55 | + */ |
|
56 | + public function hash($message); |
|
57 | 57 | |
58 | - /** |
|
59 | - * @param string $message Message to verify |
|
60 | - * @param string $hash Assumed hash of the message |
|
61 | - * @param null|string &$newHash Reference will contain the updated hash if necessary. Update the existing hash with this one. |
|
62 | - * @return bool Whether $hash is a valid hash of $message |
|
63 | - * @since 8.0.0 |
|
64 | - */ |
|
65 | - public function verify($message, $hash, &$newHash = null); |
|
58 | + /** |
|
59 | + * @param string $message Message to verify |
|
60 | + * @param string $hash Assumed hash of the message |
|
61 | + * @param null|string &$newHash Reference will contain the updated hash if necessary. Update the existing hash with this one. |
|
62 | + * @return bool Whether $hash is a valid hash of $message |
|
63 | + * @since 8.0.0 |
|
64 | + */ |
|
65 | + public function verify($message, $hash, &$newHash = null); |
|
66 | 66 | } |
@@ -36,49 +36,49 @@ |
||
36 | 36 | */ |
37 | 37 | interface ISecureRandom { |
38 | 38 | |
39 | - /** |
|
40 | - * Flags for characters that can be used for <code>generate($length, $characters)</code> |
|
41 | - */ |
|
42 | - const CHAR_UPPER = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'; |
|
43 | - const CHAR_LOWER = 'abcdefghijklmnopqrstuvwxyz'; |
|
44 | - const CHAR_DIGITS = '0123456789'; |
|
45 | - const CHAR_SYMBOLS = '!\"#$%&\\\'()* +,-./:;<=>?@[\]^_`{|}~'; |
|
39 | + /** |
|
40 | + * Flags for characters that can be used for <code>generate($length, $characters)</code> |
|
41 | + */ |
|
42 | + const CHAR_UPPER = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'; |
|
43 | + const CHAR_LOWER = 'abcdefghijklmnopqrstuvwxyz'; |
|
44 | + const CHAR_DIGITS = '0123456789'; |
|
45 | + const CHAR_SYMBOLS = '!\"#$%&\\\'()* +,-./:;<=>?@[\]^_`{|}~'; |
|
46 | 46 | |
47 | - /** |
|
48 | - * Convenience method to get a low strength random number generator. |
|
49 | - * |
|
50 | - * Low Strength should be used anywhere that random strings are needed |
|
51 | - * in a non-cryptographical setting. They are not strong enough to be |
|
52 | - * used as keys or salts. They are however useful for one-time use tokens. |
|
53 | - * |
|
54 | - * @return $this |
|
55 | - * @since 8.0.0 |
|
56 | - * @deprecated 9.0.0 Use \OC\Security\SecureRandom::generate directly or random_bytes() / random_int() |
|
57 | - */ |
|
58 | - public function getLowStrengthGenerator(); |
|
47 | + /** |
|
48 | + * Convenience method to get a low strength random number generator. |
|
49 | + * |
|
50 | + * Low Strength should be used anywhere that random strings are needed |
|
51 | + * in a non-cryptographical setting. They are not strong enough to be |
|
52 | + * used as keys or salts. They are however useful for one-time use tokens. |
|
53 | + * |
|
54 | + * @return $this |
|
55 | + * @since 8.0.0 |
|
56 | + * @deprecated 9.0.0 Use \OC\Security\SecureRandom::generate directly or random_bytes() / random_int() |
|
57 | + */ |
|
58 | + public function getLowStrengthGenerator(); |
|
59 | 59 | |
60 | - /** |
|
61 | - * Convenience method to get a medium strength random number generator. |
|
62 | - * |
|
63 | - * Medium Strength should be used for most needs of a cryptographic nature. |
|
64 | - * They are strong enough to be used as keys and salts. However, they do |
|
65 | - * take some time and resources to generate, so they should not be over-used |
|
66 | - * |
|
67 | - * @return $this |
|
68 | - * @since 8.0.0 |
|
69 | - * @deprecated 9.0.0 Use \OC\Security\SecureRandom::generate directly or random_bytes() / random_int() |
|
70 | - */ |
|
71 | - public function getMediumStrengthGenerator(); |
|
60 | + /** |
|
61 | + * Convenience method to get a medium strength random number generator. |
|
62 | + * |
|
63 | + * Medium Strength should be used for most needs of a cryptographic nature. |
|
64 | + * They are strong enough to be used as keys and salts. However, they do |
|
65 | + * take some time and resources to generate, so they should not be over-used |
|
66 | + * |
|
67 | + * @return $this |
|
68 | + * @since 8.0.0 |
|
69 | + * @deprecated 9.0.0 Use \OC\Security\SecureRandom::generate directly or random_bytes() / random_int() |
|
70 | + */ |
|
71 | + public function getMediumStrengthGenerator(); |
|
72 | 72 | |
73 | - /** |
|
74 | - * Generate a random string of specified length. |
|
75 | - * @param int $length The length of the generated string |
|
76 | - * @param string $characters An optional list of characters to use if no character list is |
|
77 | - * specified all valid base64 characters are used. |
|
78 | - * @return string |
|
79 | - * @since 8.0.0 |
|
80 | - */ |
|
81 | - public function generate($length, |
|
82 | - $characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'); |
|
73 | + /** |
|
74 | + * Generate a random string of specified length. |
|
75 | + * @param int $length The length of the generated string |
|
76 | + * @param string $characters An optional list of characters to use if no character list is |
|
77 | + * specified all valid base64 characters are used. |
|
78 | + * @return string |
|
79 | + * @since 8.0.0 |
|
80 | + */ |
|
81 | + public function generate($length, |
|
82 | + $characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'); |
|
83 | 83 | |
84 | 84 | } |
@@ -30,22 +30,22 @@ |
||
30 | 30 | * @since 9.0.0 |
31 | 31 | */ |
32 | 32 | interface IContentSecurityPolicyManager { |
33 | - /** |
|
34 | - * Allows to inject something into the default content policy. This is for |
|
35 | - * example useful when you're injecting Javascript code into a view belonging |
|
36 | - * to another controller and cannot modify its Content-Security-Policy itself. |
|
37 | - * Note that the adjustment is only applied to applications that use AppFramework |
|
38 | - * controllers. |
|
39 | - * |
|
40 | - * To use this from your `app.php` use `\OC::$server->getContentSecurityPolicyManager()->addDefaultPolicy($policy)`, |
|
41 | - * $policy has to be of type `\OCP\AppFramework\Http\ContentSecurityPolicy`. |
|
42 | - * |
|
43 | - * WARNING: Using this API incorrectly may make the instance more insecure. |
|
44 | - * Do think twice before adding whitelisting resources. Please do also note |
|
45 | - * that it is not possible to use the `disallowXYZ` functions. |
|
46 | - * |
|
47 | - * @param EmptyContentSecurityPolicy $policy |
|
48 | - * @since 9.0.0 |
|
49 | - */ |
|
50 | - public function addDefaultPolicy(EmptyContentSecurityPolicy $policy); |
|
33 | + /** |
|
34 | + * Allows to inject something into the default content policy. This is for |
|
35 | + * example useful when you're injecting Javascript code into a view belonging |
|
36 | + * to another controller and cannot modify its Content-Security-Policy itself. |
|
37 | + * Note that the adjustment is only applied to applications that use AppFramework |
|
38 | + * controllers. |
|
39 | + * |
|
40 | + * To use this from your `app.php` use `\OC::$server->getContentSecurityPolicyManager()->addDefaultPolicy($policy)`, |
|
41 | + * $policy has to be of type `\OCP\AppFramework\Http\ContentSecurityPolicy`. |
|
42 | + * |
|
43 | + * WARNING: Using this API incorrectly may make the instance more insecure. |
|
44 | + * Do think twice before adding whitelisting resources. Please do also note |
|
45 | + * that it is not possible to use the `disallowXYZ` functions. |
|
46 | + * |
|
47 | + * @param EmptyContentSecurityPolicy $policy |
|
48 | + * @since 9.0.0 |
|
49 | + */ |
|
50 | + public function addDefaultPolicy(EmptyContentSecurityPolicy $policy); |
|
51 | 51 | } |
@@ -36,30 +36,30 @@ |
||
36 | 36 | */ |
37 | 37 | interface ICrypto { |
38 | 38 | |
39 | - /** |
|
40 | - * @param string $message The message to authenticate |
|
41 | - * @param string $password Password to use (defaults to `secret` in config.php) |
|
42 | - * @return string Calculated HMAC |
|
43 | - * @since 8.0.0 |
|
44 | - */ |
|
45 | - public function calculateHMAC($message, $password = ''); |
|
39 | + /** |
|
40 | + * @param string $message The message to authenticate |
|
41 | + * @param string $password Password to use (defaults to `secret` in config.php) |
|
42 | + * @return string Calculated HMAC |
|
43 | + * @since 8.0.0 |
|
44 | + */ |
|
45 | + public function calculateHMAC($message, $password = ''); |
|
46 | 46 | |
47 | - /** |
|
48 | - * Encrypts a value and adds an HMAC (Encrypt-Then-MAC) |
|
49 | - * @param string $plaintext |
|
50 | - * @param string $password Password to encrypt, if not specified the secret from config.php will be taken |
|
51 | - * @return string Authenticated ciphertext |
|
52 | - * @since 8.0.0 |
|
53 | - */ |
|
54 | - public function encrypt($plaintext, $password = ''); |
|
47 | + /** |
|
48 | + * Encrypts a value and adds an HMAC (Encrypt-Then-MAC) |
|
49 | + * @param string $plaintext |
|
50 | + * @param string $password Password to encrypt, if not specified the secret from config.php will be taken |
|
51 | + * @return string Authenticated ciphertext |
|
52 | + * @since 8.0.0 |
|
53 | + */ |
|
54 | + public function encrypt($plaintext, $password = ''); |
|
55 | 55 | |
56 | - /** |
|
57 | - * Decrypts a value and verifies the HMAC (Encrypt-Then-Mac) |
|
58 | - * @param string $authenticatedCiphertext |
|
59 | - * @param string $password Password to encrypt, if not specified the secret from config.php will be taken |
|
60 | - * @return string plaintext |
|
61 | - * @throws \Exception If the HMAC does not match |
|
62 | - * @since 8.0.0 |
|
63 | - */ |
|
64 | - public function decrypt($authenticatedCiphertext, $password = ''); |
|
56 | + /** |
|
57 | + * Decrypts a value and verifies the HMAC (Encrypt-Then-Mac) |
|
58 | + * @param string $authenticatedCiphertext |
|
59 | + * @param string $password Password to encrypt, if not specified the secret from config.php will be taken |
|
60 | + * @return string plaintext |
|
61 | + * @throws \Exception If the HMAC does not match |
|
62 | + * @since 8.0.0 |
|
63 | + */ |
|
64 | + public function decrypt($authenticatedCiphertext, $password = ''); |
|
65 | 65 | } |
@@ -47,57 +47,57 @@ |
||
47 | 47 | */ |
48 | 48 | interface IContainer { |
49 | 49 | |
50 | - /** |
|
51 | - * If a parameter is not registered in the container try to instantiate it |
|
52 | - * by using reflection to find out how to build the class |
|
53 | - * @param string $name the class name to resolve |
|
54 | - * @return \stdClass |
|
55 | - * @since 8.2.0 |
|
56 | - * @throws QueryException if the class could not be found or instantiated |
|
57 | - */ |
|
58 | - public function resolve($name); |
|
50 | + /** |
|
51 | + * If a parameter is not registered in the container try to instantiate it |
|
52 | + * by using reflection to find out how to build the class |
|
53 | + * @param string $name the class name to resolve |
|
54 | + * @return \stdClass |
|
55 | + * @since 8.2.0 |
|
56 | + * @throws QueryException if the class could not be found or instantiated |
|
57 | + */ |
|
58 | + public function resolve($name); |
|
59 | 59 | |
60 | - /** |
|
61 | - * Look up a service for a given name in the container. |
|
62 | - * |
|
63 | - * @param string $name |
|
64 | - * @return mixed |
|
65 | - * @since 6.0.0 |
|
66 | - */ |
|
67 | - public function query($name); |
|
60 | + /** |
|
61 | + * Look up a service for a given name in the container. |
|
62 | + * |
|
63 | + * @param string $name |
|
64 | + * @return mixed |
|
65 | + * @since 6.0.0 |
|
66 | + */ |
|
67 | + public function query($name); |
|
68 | 68 | |
69 | - /** |
|
70 | - * A value is stored in the container with it's corresponding name |
|
71 | - * |
|
72 | - * @param string $name |
|
73 | - * @param mixed $value |
|
74 | - * @return void |
|
75 | - * @since 6.0.0 |
|
76 | - */ |
|
77 | - public function registerParameter($name, $value); |
|
69 | + /** |
|
70 | + * A value is stored in the container with it's corresponding name |
|
71 | + * |
|
72 | + * @param string $name |
|
73 | + * @param mixed $value |
|
74 | + * @return void |
|
75 | + * @since 6.0.0 |
|
76 | + */ |
|
77 | + public function registerParameter($name, $value); |
|
78 | 78 | |
79 | - /** |
|
80 | - * A service is registered in the container where a closure is passed in which will actually |
|
81 | - * create the service on demand. |
|
82 | - * In case the parameter $shared is set to true (the default usage) the once created service will remain in |
|
83 | - * memory and be reused on subsequent calls. |
|
84 | - * In case the parameter is false the service will be recreated on every call. |
|
85 | - * |
|
86 | - * @param string $name |
|
87 | - * @param \Closure $closure |
|
88 | - * @param bool $shared |
|
89 | - * @return void |
|
90 | - * @since 6.0.0 |
|
91 | - */ |
|
92 | - public function registerService($name, Closure $closure, $shared = true); |
|
79 | + /** |
|
80 | + * A service is registered in the container where a closure is passed in which will actually |
|
81 | + * create the service on demand. |
|
82 | + * In case the parameter $shared is set to true (the default usage) the once created service will remain in |
|
83 | + * memory and be reused on subsequent calls. |
|
84 | + * In case the parameter is false the service will be recreated on every call. |
|
85 | + * |
|
86 | + * @param string $name |
|
87 | + * @param \Closure $closure |
|
88 | + * @param bool $shared |
|
89 | + * @return void |
|
90 | + * @since 6.0.0 |
|
91 | + */ |
|
92 | + public function registerService($name, Closure $closure, $shared = true); |
|
93 | 93 | |
94 | - /** |
|
95 | - * Shortcut for returning a service from a service under a different key, |
|
96 | - * e.g. to tell the container to return a class when queried for an |
|
97 | - * interface |
|
98 | - * @param string $alias the alias that should be registered |
|
99 | - * @param string $target the target that should be resolved instead |
|
100 | - * @since 8.2.0 |
|
101 | - */ |
|
102 | - public function registerAlias($alias, $target); |
|
94 | + /** |
|
95 | + * Shortcut for returning a service from a service under a different key, |
|
96 | + * e.g. to tell the container to return a class when queried for an |
|
97 | + * interface |
|
98 | + * @param string $alias the alias that should be registered |
|
99 | + * @param string $target the target that should be resolved instead |
|
100 | + * @since 8.2.0 |
|
101 | + */ |
|
102 | + public function registerAlias($alias, $target); |
|
103 | 103 | } |