nextcloud / server

lib/public/Files/Notify/IChange.php

Indentation +22 added lines, -22 removed lines

@@ -29,28 +29,28 @@
  * @since 12.0.0
  */
 interface IChange {
-	public const ADDED = 1;
-	public const REMOVED = 2;
-	public const MODIFIED = 3;
-	public const RENAMED = 4;
+    public const ADDED = 1;
+    public const REMOVED = 2;
+    public const MODIFIED = 3;
+    public const RENAMED = 4;
 
-	/**
-	 * Get the type of the change
-	 *
-	 * @return int IChange::ADDED, IChange::REMOVED, IChange::MODIFIED or IChange::RENAMED
-	 *
-	 * @since 12.0.0
-	 */
-	public function getType();
+    /**
+     * Get the type of the change
+     *
+     * @return int IChange::ADDED, IChange::REMOVED, IChange::MODIFIED or IChange::RENAMED
+     *
+     * @since 12.0.0
+     */
+    public function getType();
 
-	/**
-	 * Get the path of the file that was changed relative to the root of the storage
-	 *
-	 * Note, for rename changes this path is the old path for the file
-	 *
-	 * @return mixed
-	 *
-	 * @since 12.0.0
-	 */
-	public function getPath();
+    /**
+     * Get the path of the file that was changed relative to the root of the storage
+     *
+     * Note, for rename changes this path is the old path for the file
+     *
+     * @return mixed
+     *
+     * @since 12.0.0
+     */
+    public function getPath();
 }

lib/public/Files/StorageNotAvailableException.php

Indentation +44 added lines, -44 removed lines

@@ -44,50 +44,50 @@
  * @since 6.0.0 - since 8.2.1 based on HintException
  */
 class StorageNotAvailableException extends HintException {
-	public const STATUS_SUCCESS = 0;
-	public const STATUS_ERROR = 1;
-	public const STATUS_INDETERMINATE = 2;
-	public const STATUS_INCOMPLETE_CONF = 3;
-	public const STATUS_UNAUTHORIZED = 4;
-	public const STATUS_TIMEOUT = 5;
-	public const STATUS_NETWORK_ERROR = 6;
+    public const STATUS_SUCCESS = 0;
+    public const STATUS_ERROR = 1;
+    public const STATUS_INDETERMINATE = 2;
+    public const STATUS_INCOMPLETE_CONF = 3;
+    public const STATUS_UNAUTHORIZED = 4;
+    public const STATUS_TIMEOUT = 5;
+    public const STATUS_NETWORK_ERROR = 6;
 
-	/**
-	 * StorageNotAvailableException constructor.
-	 *
-	 * @param string $message
-	 * @param int $code
-	 * @param \Exception|null $previous
-	 * @since 6.0.0
-	 */
-	public function __construct($message = '', $code = self::STATUS_ERROR, \Exception $previous = null) {
-		$l = \OC::$server->getL10N('core');
-		parent::__construct($message, $l->t('Storage is temporarily not available'), $code, $previous);
-	}
+    /**
+     * StorageNotAvailableException constructor.
+     *
+     * @param string $message
+     * @param int $code
+     * @param \Exception|null $previous
+     * @since 6.0.0
+     */
+    public function __construct($message = '', $code = self::STATUS_ERROR, \Exception $previous = null) {
+        $l = \OC::$server->getL10N('core');
+        parent::__construct($message, $l->t('Storage is temporarily not available'), $code, $previous);
+    }
 
-	/**
-	 * Get the name for a status code
-	 *
-	 * @param int $code
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public static function getStateCodeName($code) {
-		switch ($code) {
-			case self::STATUS_SUCCESS:
-				return 'ok';
-			case self::STATUS_ERROR:
-				return 'error';
-			case self::STATUS_INDETERMINATE:
-				return 'indeterminate';
-			case self::STATUS_UNAUTHORIZED:
-				return 'unauthorized';
-			case self::STATUS_TIMEOUT:
-				return 'timeout';
-			case self::STATUS_NETWORK_ERROR:
-				return 'network error';
-			default:
-				return 'unknown';
-		}
-	}
+    /**
+     * Get the name for a status code
+     *
+     * @param int $code
+     * @return string
+     * @since 9.0.0
+     */
+    public static function getStateCodeName($code) {
+        switch ($code) {
+            case self::STATUS_SUCCESS:
+                return 'ok';
+            case self::STATUS_ERROR:
+                return 'error';
+            case self::STATUS_INDETERMINATE:
+                return 'indeterminate';
+            case self::STATUS_UNAUTHORIZED:
+                return 'unauthorized';
+            case self::STATUS_TIMEOUT:
+                return 'timeout';
+            case self::STATUS_NETWORK_ERROR:
+                return 'network error';
+            default:
+                return 'unknown';
+        }
+    }
 }

lib/public/Files/Search/ISearchBinaryOperator.php

Indentation +21 added lines, -21 removed lines

@@ -27,27 +27,27 @@
  * @since 12.0.0
  */
 interface ISearchBinaryOperator extends ISearchOperator {
-	public const OPERATOR_AND = 'and';
-	public const OPERATOR_OR = 'or';
-	public const OPERATOR_NOT = 'not';
+    public const OPERATOR_AND = 'and';
+    public const OPERATOR_OR = 'or';
+    public const OPERATOR_NOT = 'not';
 
-	/**
-	 * The type of binary operator
-	 *
-	 * One of the ISearchBinaryOperator::OPERATOR_* constants
-	 *
-	 * @return string
-	 * @since 12.0.0
-	 */
-	public function getType();
+    /**
+     * The type of binary operator
+     *
+     * One of the ISearchBinaryOperator::OPERATOR_* constants
+     *
+     * @return string
+     * @since 12.0.0
+     */
+    public function getType();
 
-	/**
-	 * The arguments for the binary operator
-	 *
-	 * One argument for the 'not' operator and two for 'and' and 'or'
-	 *
-	 * @return ISearchOperator[]
-	 * @since 12.0.0
-	 */
-	public function getArguments();
+    /**
+     * The arguments for the binary operator
+     *
+     * One argument for the 'not' operator and two for 'and' and 'or'
+     *
+     * @return ISearchOperator[]
+     * @since 12.0.0
+     */
+    public function getArguments();
 }

lib/public/AppFramework/Http.php

Indentation +59 added lines, -59 removed lines

@@ -34,63 +34,63 @@
  * @since 6.0.0
  */
 class Http {
-	public const STATUS_CONTINUE = 100;
-	public const STATUS_SWITCHING_PROTOCOLS = 101;
-	public const STATUS_PROCESSING = 102;
-	public const STATUS_OK = 200;
-	public const STATUS_CREATED = 201;
-	public const STATUS_ACCEPTED = 202;
-	public const STATUS_NON_AUTHORATIVE_INFORMATION = 203;
-	public const STATUS_NO_CONTENT = 204;
-	public const STATUS_RESET_CONTENT = 205;
-	public const STATUS_PARTIAL_CONTENT = 206;
-	public const STATUS_MULTI_STATUS = 207;
-	public const STATUS_ALREADY_REPORTED = 208;
-	public const STATUS_IM_USED = 226;
-	public const STATUS_MULTIPLE_CHOICES = 300;
-	public const STATUS_MOVED_PERMANENTLY = 301;
-	public const STATUS_FOUND = 302;
-	public const STATUS_SEE_OTHER = 303;
-	public const STATUS_NOT_MODIFIED = 304;
-	public const STATUS_USE_PROXY = 305;
-	public const STATUS_RESERVED = 306;
-	public const STATUS_TEMPORARY_REDIRECT = 307;
-	public const STATUS_BAD_REQUEST = 400;
-	public const STATUS_UNAUTHORIZED = 401;
-	public const STATUS_PAYMENT_REQUIRED = 402;
-	public const STATUS_FORBIDDEN = 403;
-	public const STATUS_NOT_FOUND = 404;
-	public const STATUS_METHOD_NOT_ALLOWED = 405;
-	public const STATUS_NOT_ACCEPTABLE = 406;
-	public const STATUS_PROXY_AUTHENTICATION_REQUIRED = 407;
-	public const STATUS_REQUEST_TIMEOUT = 408;
-	public const STATUS_CONFLICT = 409;
-	public const STATUS_GONE = 410;
-	public const STATUS_LENGTH_REQUIRED = 411;
-	public const STATUS_PRECONDITION_FAILED = 412;
-	public const STATUS_REQUEST_ENTITY_TOO_LARGE = 413;
-	public const STATUS_REQUEST_URI_TOO_LONG = 414;
-	public const STATUS_UNSUPPORTED_MEDIA_TYPE = 415;
-	public const STATUS_REQUEST_RANGE_NOT_SATISFIABLE = 416;
-	public const STATUS_EXPECTATION_FAILED = 417;
-	public const STATUS_IM_A_TEAPOT = 418;
-	public const STATUS_UNPROCESSABLE_ENTITY = 422;
-	public const STATUS_LOCKED = 423;
-	public const STATUS_FAILED_DEPENDENCY = 424;
-	public const STATUS_UPGRADE_REQUIRED = 426;
-	public const STATUS_PRECONDITION_REQUIRED = 428;
-	public const STATUS_TOO_MANY_REQUESTS = 429;
-	public const STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE = 431;
-	public const STATUS_INTERNAL_SERVER_ERROR = 500;
-	public const STATUS_NOT_IMPLEMENTED = 501;
-	public const STATUS_BAD_GATEWAY = 502;
-	public const STATUS_SERVICE_UNAVAILABLE = 503;
-	public const STATUS_GATEWAY_TIMEOUT = 504;
-	public const STATUS_HTTP_VERSION_NOT_SUPPORTED = 505;
-	public const STATUS_VARIANT_ALSO_NEGOTIATES = 506;
-	public const STATUS_INSUFFICIENT_STORAGE = 507;
-	public const STATUS_LOOP_DETECTED = 508;
-	public const STATUS_BANDWIDTH_LIMIT_EXCEEDED = 509;
-	public const STATUS_NOT_EXTENDED = 510;
-	public const STATUS_NETWORK_AUTHENTICATION_REQUIRED = 511;
+    public const STATUS_CONTINUE = 100;
+    public const STATUS_SWITCHING_PROTOCOLS = 101;
+    public const STATUS_PROCESSING = 102;
+    public const STATUS_OK = 200;
+    public const STATUS_CREATED = 201;
+    public const STATUS_ACCEPTED = 202;
+    public const STATUS_NON_AUTHORATIVE_INFORMATION = 203;
+    public const STATUS_NO_CONTENT = 204;
+    public const STATUS_RESET_CONTENT = 205;
+    public const STATUS_PARTIAL_CONTENT = 206;
+    public const STATUS_MULTI_STATUS = 207;
+    public const STATUS_ALREADY_REPORTED = 208;
+    public const STATUS_IM_USED = 226;
+    public const STATUS_MULTIPLE_CHOICES = 300;
+    public const STATUS_MOVED_PERMANENTLY = 301;
+    public const STATUS_FOUND = 302;
+    public const STATUS_SEE_OTHER = 303;
+    public const STATUS_NOT_MODIFIED = 304;
+    public const STATUS_USE_PROXY = 305;
+    public const STATUS_RESERVED = 306;
+    public const STATUS_TEMPORARY_REDIRECT = 307;
+    public const STATUS_BAD_REQUEST = 400;
+    public const STATUS_UNAUTHORIZED = 401;
+    public const STATUS_PAYMENT_REQUIRED = 402;
+    public const STATUS_FORBIDDEN = 403;
+    public const STATUS_NOT_FOUND = 404;
+    public const STATUS_METHOD_NOT_ALLOWED = 405;
+    public const STATUS_NOT_ACCEPTABLE = 406;
+    public const STATUS_PROXY_AUTHENTICATION_REQUIRED = 407;
+    public const STATUS_REQUEST_TIMEOUT = 408;
+    public const STATUS_CONFLICT = 409;
+    public const STATUS_GONE = 410;
+    public const STATUS_LENGTH_REQUIRED = 411;
+    public const STATUS_PRECONDITION_FAILED = 412;
+    public const STATUS_REQUEST_ENTITY_TOO_LARGE = 413;
+    public const STATUS_REQUEST_URI_TOO_LONG = 414;
+    public const STATUS_UNSUPPORTED_MEDIA_TYPE = 415;
+    public const STATUS_REQUEST_RANGE_NOT_SATISFIABLE = 416;
+    public const STATUS_EXPECTATION_FAILED = 417;
+    public const STATUS_IM_A_TEAPOT = 418;
+    public const STATUS_UNPROCESSABLE_ENTITY = 422;
+    public const STATUS_LOCKED = 423;
+    public const STATUS_FAILED_DEPENDENCY = 424;
+    public const STATUS_UPGRADE_REQUIRED = 426;
+    public const STATUS_PRECONDITION_REQUIRED = 428;
+    public const STATUS_TOO_MANY_REQUESTS = 429;
+    public const STATUS_REQUEST_HEADER_FIELDS_TOO_LARGE = 431;
+    public const STATUS_INTERNAL_SERVER_ERROR = 500;
+    public const STATUS_NOT_IMPLEMENTED = 501;
+    public const STATUS_BAD_GATEWAY = 502;
+    public const STATUS_SERVICE_UNAVAILABLE = 503;
+    public const STATUS_GATEWAY_TIMEOUT = 504;
+    public const STATUS_HTTP_VERSION_NOT_SUPPORTED = 505;
+    public const STATUS_VARIANT_ALSO_NEGOTIATES = 506;
+    public const STATUS_INSUFFICIENT_STORAGE = 507;
+    public const STATUS_LOOP_DETECTED = 508;
+    public const STATUS_BANDWIDTH_LIMIT_EXCEEDED = 509;
+    public const STATUS_NOT_EXTENDED = 510;
+    public const STATUS_NETWORK_AUTHENTICATION_REQUIRED = 511;
 }

lib/private/Remote/User.php

Indentation +110 added lines, -110 removed lines

@@ -26,114 +26,114 @@
 use OCP\Remote\IUser;
 
 class User implements IUser {
-	public const EXPECTED_KEYS = [
-		'id',
-		'email',
-		'displayname',
-		'phone',
-		'address',
-		'website',
-		'groups',
-		'language',
-		'quota'
-	];
-
-	/** @var array */
-	private $data;
-
-	public function __construct(array $data) {
-		$this->data = $data;
-	}
-
-
-	/**
-	 * @return string
-	 */
-	public function getUserId() {
-		return $this->data['id'];
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getEmail() {
-		return $this->data['email'];
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getDisplayName() {
-		return $this->data['displayname'];
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getPhone() {
-		return $this->data['phone'];
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getAddress() {
-		return $this->data['address'];
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getWebsite() {
-		return $this->data['website'];
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getTwitter() {
-		return isset($this->data['twitter']) ? $this->data['twitter'] : '';
-	}
-
-	/**
-	 * @return string[]
-	 */
-	public function getGroups() {
-		return $this->data['groups'];
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getLanguage() {
-		return $this->data['language'];
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getUsedSpace() {
-		return $this->data['quota']['used'];
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getFreeSpace() {
-		return $this->data['quota']['free'];
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getTotalSpace() {
-		return $this->data['quota']['total'];
-	}
-
-	/**
-	 * @return int
-	 */
-	public function getQuota() {
-		return $this->data['quota']['quota'];
-	}
+    public const EXPECTED_KEYS = [
+        'id',
+        'email',
+        'displayname',
+        'phone',
+        'address',
+        'website',
+        'groups',
+        'language',
+        'quota'
+    ];
+
+    /** @var array */
+    private $data;
+
+    public function __construct(array $data) {
+        $this->data = $data;
+    }
+
+
+    /**
+     * @return string
+     */
+    public function getUserId() {
+        return $this->data['id'];
+    }
+
+    /**
+     * @return string
+     */
+    public function getEmail() {
+        return $this->data['email'];
+    }
+
+    /**
+     * @return string
+     */
+    public function getDisplayName() {
+        return $this->data['displayname'];
+    }
+
+    /**
+     * @return string
+     */
+    public function getPhone() {
+        return $this->data['phone'];
+    }
+
+    /**
+     * @return string
+     */
+    public function getAddress() {
+        return $this->data['address'];
+    }
+
+    /**
+     * @return string
+     */
+    public function getWebsite() {
+        return $this->data['website'];
+    }
+
+    /**
+     * @return string
+     */
+    public function getTwitter() {
+        return isset($this->data['twitter']) ? $this->data['twitter'] : '';
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getGroups() {
+        return $this->data['groups'];
+    }
+
+    /**
+     * @return string
+     */
+    public function getLanguage() {
+        return $this->data['language'];
+    }
+
+    /**
+     * @return int
+     */
+    public function getUsedSpace() {
+        return $this->data['quota']['used'];
+    }
+
+    /**
+     * @return int
+     */
+    public function getFreeSpace() {
+        return $this->data['quota']['free'];
+    }
+
+    /**
+     * @return int
+     */
+    public function getTotalSpace() {
+        return $this->data['quota']['total'];
+    }
+
+    /**
+     * @return int
+     */
+    public function getQuota() {
+        return $this->data['quota']['quota'];
+    }
 }

lib/private/Authentication/Token/IToken.php

Indentation +102 added lines, -102 removed lines

@@ -30,106 +30,106 @@
 use JsonSerializable;
 
 interface IToken extends JsonSerializable {
-	public const TEMPORARY_TOKEN = 0;
-	public const PERMANENT_TOKEN = 1;
-	public const WIPE_TOKEN = 2;
-	public const DO_NOT_REMEMBER = 0;
-	public const REMEMBER = 1;
-
-	/**
-	 * Get the token ID
-	 *
-	 * @return int
-	 */
-	public function getId(): int;
-
-	/**
-	 * Get the user UID
-	 *
-	 * @return string
-	 */
-	public function getUID(): string;
-
-	/**
-	 * Get the login name used when generating the token
-	 *
-	 * @return string
-	 */
-	public function getLoginName(): string;
-
-	/**
-	 * Get the (encrypted) login password
-	 *
-	 * @return string|null
-	 */
-	public function getPassword();
-
-	/**
-	 * Get the timestamp of the last password check
-	 *
-	 * @return int
-	 */
-	public function getLastCheck(): int;
-
-	/**
-	 * Set the timestamp of the last password check
-	 *
-	 * @param int $time
-	 */
-	public function setLastCheck(int $time);
-
-	/**
-	 * Get the authentication scope for this token
-	 *
-	 * @return string
-	 */
-	public function getScope(): string;
-
-	/**
-	 * Get the authentication scope for this token
-	 *
-	 * @return array
-	 */
-	public function getScopeAsArray(): array;
-
-	/**
-	 * Set the authentication scope for this token
-	 *
-	 * @param array $scope
-	 */
-	public function setScope($scope);
-
-	/**
-	 * Get the name of the token
-	 * @return string
-	 */
-	public function getName(): string;
-
-	/**
-	 * Get the remember state of the token
-	 *
-	 * @return int
-	 */
-	public function getRemember(): int;
-
-	/**
-	 * Set the token
-	 *
-	 * @param string $token
-	 */
-	public function setToken(string $token);
-
-	/**
-	 * Set the password
-	 *
-	 * @param string $password
-	 */
-	public function setPassword(string $password);
-
-	/**
-	 * Set the expiration time of the token
-	 *
-	 * @param int|null $expires
-	 */
-	public function setExpires($expires);
+    public const TEMPORARY_TOKEN = 0;
+    public const PERMANENT_TOKEN = 1;
+    public const WIPE_TOKEN = 2;
+    public const DO_NOT_REMEMBER = 0;
+    public const REMEMBER = 1;
+
+    /**
+     * Get the token ID
+     *
+     * @return int
+     */
+    public function getId(): int;
+
+    /**
+     * Get the user UID
+     *
+     * @return string
+     */
+    public function getUID(): string;
+
+    /**
+     * Get the login name used when generating the token
+     *
+     * @return string
+     */
+    public function getLoginName(): string;
+
+    /**
+     * Get the (encrypted) login password
+     *
+     * @return string|null
+     */
+    public function getPassword();
+
+    /**
+     * Get the timestamp of the last password check
+     *
+     * @return int
+     */
+    public function getLastCheck(): int;
+
+    /**
+     * Set the timestamp of the last password check
+     *
+     * @param int $time
+     */
+    public function setLastCheck(int $time);
+
+    /**
+     * Get the authentication scope for this token
+     *
+     * @return string
+     */
+    public function getScope(): string;
+
+    /**
+     * Get the authentication scope for this token
+     *
+     * @return array
+     */
+    public function getScopeAsArray(): array;
+
+    /**
+     * Set the authentication scope for this token
+     *
+     * @param array $scope
+     */
+    public function setScope($scope);
+
+    /**
+     * Get the name of the token
+     * @return string
+     */
+    public function getName(): string;
+
+    /**
+     * Get the remember state of the token
+     *
+     * @return int
+     */
+    public function getRemember(): int;
+
+    /**
+     * Set the token
+     *
+     * @param string $token
+     */
+    public function setToken(string $token);
+
+    /**
+     * Set the password
+     *
+     * @param string $password
+     */
+    public function setPassword(string $password);
+
+    /**
+     * Set the expiration time of the token
+     *
+     * @param int|null $expires
+     */
+    public function setExpires($expires);
 }

apps/encryption/lib/Session.php

Indentation +153 added lines, -153 removed lines

@@ -31,157 +31,157 @@
 
 class Session {
 
-	/** @var ISession */
-	protected $session;
-
-	public const NOT_INITIALIZED = '0';
-	public const INIT_EXECUTED = '1';
-	public const INIT_SUCCESSFUL = '2';
-
-	/**
-	 * @param ISession $session
-	 */
-	public function __construct(ISession $session) {
-		$this->session = $session;
-	}
-
-	/**
-	 * Sets status of encryption app
-	 *
-	 * @param string $status INIT_SUCCESSFUL, INIT_EXECUTED, NOT_INITIALIZED
-	 */
-	public function setStatus($status) {
-		$this->session->set('encryptionInitialized', $status);
-	}
-
-	/**
-	 * Gets status if we already tried to initialize the encryption app
-	 *
-	 * @return string init status INIT_SUCCESSFUL, INIT_EXECUTED, NOT_INITIALIZED
-	 */
-	public function getStatus() {
-		$status = $this->session->get('encryptionInitialized');
-		if (is_null($status)) {
-			$status = self::NOT_INITIALIZED;
-		}
-
-		return $status;
-	}
-
-	/**
-	 * check if encryption was initialized successfully
-	 *
-	 * @return bool
-	 */
-	public function isReady() {
-		$status = $this->getStatus();
-		return $status === self::INIT_SUCCESSFUL;
-	}
-
-	/**
-	 * Gets user or public share private key from session
-	 *
-	 * @return string $privateKey The user's plaintext private key
-	 * @throws Exceptions\PrivateKeyMissingException
-	 */
-	public function getPrivateKey() {
-		$key = $this->session->get('privateKey');
-		if (is_null($key)) {
-			throw new Exceptions\PrivateKeyMissingException('please try to log-out and log-in again', 0);
-		}
-		return $key;
-	}
-
-	/**
-	 * check if private key is set
-	 *
-	 * @return boolean
-	 */
-	public function isPrivateKeySet() {
-		$key = $this->session->get('privateKey');
-		if (is_null($key)) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Sets user private key to session
-	 *
-	 * @param string $key users private key
-	 *
-	 * @note this should only be set on login
-	 */
-	public function setPrivateKey($key) {
-		$this->session->set('privateKey', $key);
-	}
-
-	/**
-	 * store data needed for the decrypt all operation in the session
-	 *
-	 * @param string $user
-	 * @param string $key
-	 */
-	public function prepareDecryptAll($user, $key) {
-		$this->session->set('decryptAll', true);
-		$this->session->set('decryptAllKey', $key);
-		$this->session->set('decryptAllUid', $user);
-	}
-
-	/**
-	 * check if we are in decrypt all mode
-	 *
-	 * @return bool
-	 */
-	public function decryptAllModeActivated() {
-		$decryptAll = $this->session->get('decryptAll');
-		return ($decryptAll === true);
-	}
-
-	/**
-	 * get uid used for decrypt all operation
-	 *
-	 * @return string
-	 * @throws \Exception
-	 */
-	public function getDecryptAllUid() {
-		$uid = $this->session->get('decryptAllUid');
-		if (is_null($uid) && $this->decryptAllModeActivated()) {
-			throw new \Exception('No uid found while in decrypt all mode');
-		} elseif (is_null($uid)) {
-			throw new \Exception('Please activate decrypt all mode first');
-		}
-
-		return $uid;
-	}
-
-	/**
-	 * get private key for decrypt all operation
-	 *
-	 * @return string
-	 * @throws PrivateKeyMissingException
-	 */
-	public function getDecryptAllKey() {
-		$privateKey = $this->session->get('decryptAllKey');
-		if (is_null($privateKey) && $this->decryptAllModeActivated()) {
-			throw new PrivateKeyMissingException('No private key found while in decrypt all mode');
-		} elseif (is_null($privateKey)) {
-			throw new PrivateKeyMissingException('Please activate decrypt all mode first');
-		}
-
-		return $privateKey;
-	}
-
-	/**
-	 * remove keys from session
-	 */
-	public function clear() {
-		$this->session->remove('publicSharePrivateKey');
-		$this->session->remove('privateKey');
-		$this->session->remove('encryptionInitialized');
-		$this->session->remove('decryptAll');
-		$this->session->remove('decryptAllKey');
-		$this->session->remove('decryptAllUid');
-	}
+    /** @var ISession */
+    protected $session;
+
+    public const NOT_INITIALIZED = '0';
+    public const INIT_EXECUTED = '1';
+    public const INIT_SUCCESSFUL = '2';
+
+    /**
+     * @param ISession $session
+     */
+    public function __construct(ISession $session) {
+        $this->session = $session;
+    }
+
+    /**
+     * Sets status of encryption app
+     *
+     * @param string $status INIT_SUCCESSFUL, INIT_EXECUTED, NOT_INITIALIZED
+     */
+    public function setStatus($status) {
+        $this->session->set('encryptionInitialized', $status);
+    }
+
+    /**
+     * Gets status if we already tried to initialize the encryption app
+     *
+     * @return string init status INIT_SUCCESSFUL, INIT_EXECUTED, NOT_INITIALIZED
+     */
+    public function getStatus() {
+        $status = $this->session->get('encryptionInitialized');
+        if (is_null($status)) {
+            $status = self::NOT_INITIALIZED;
+        }
+
+        return $status;
+    }
+
+    /**
+     * check if encryption was initialized successfully
+     *
+     * @return bool
+     */
+    public function isReady() {
+        $status = $this->getStatus();
+        return $status === self::INIT_SUCCESSFUL;
+    }
+
+    /**
+     * Gets user or public share private key from session
+     *
+     * @return string $privateKey The user's plaintext private key
+     * @throws Exceptions\PrivateKeyMissingException
+     */
+    public function getPrivateKey() {
+        $key = $this->session->get('privateKey');
+        if (is_null($key)) {
+            throw new Exceptions\PrivateKeyMissingException('please try to log-out and log-in again', 0);
+        }
+        return $key;
+    }
+
+    /**
+     * check if private key is set
+     *
+     * @return boolean
+     */
+    public function isPrivateKeySet() {
+        $key = $this->session->get('privateKey');
+        if (is_null($key)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Sets user private key to session
+     *
+     * @param string $key users private key
+     *
+     * @note this should only be set on login
+     */
+    public function setPrivateKey($key) {
+        $this->session->set('privateKey', $key);
+    }
+
+    /**
+     * store data needed for the decrypt all operation in the session
+     *
+     * @param string $user
+     * @param string $key
+     */
+    public function prepareDecryptAll($user, $key) {
+        $this->session->set('decryptAll', true);
+        $this->session->set('decryptAllKey', $key);
+        $this->session->set('decryptAllUid', $user);
+    }
+
+    /**
+     * check if we are in decrypt all mode
+     *
+     * @return bool
+     */
+    public function decryptAllModeActivated() {
+        $decryptAll = $this->session->get('decryptAll');
+        return ($decryptAll === true);
+    }
+
+    /**
+     * get uid used for decrypt all operation
+     *
+     * @return string
+     * @throws \Exception
+     */
+    public function getDecryptAllUid() {
+        $uid = $this->session->get('decryptAllUid');
+        if (is_null($uid) && $this->decryptAllModeActivated()) {
+            throw new \Exception('No uid found while in decrypt all mode');
+        } elseif (is_null($uid)) {
+            throw new \Exception('Please activate decrypt all mode first');
+        }
+
+        return $uid;
+    }
+
+    /**
+     * get private key for decrypt all operation
+     *
+     * @return string
+     * @throws PrivateKeyMissingException
+     */
+    public function getDecryptAllKey() {
+        $privateKey = $this->session->get('decryptAllKey');
+        if (is_null($privateKey) && $this->decryptAllModeActivated()) {
+            throw new PrivateKeyMissingException('No private key found while in decrypt all mode');
+        } elseif (is_null($privateKey)) {
+            throw new PrivateKeyMissingException('Please activate decrypt all mode first');
+        }
+
+        return $privateKey;
+    }
+
+    /**
+     * remove keys from session
+     */
+    public function clear() {
+        $this->session->remove('publicSharePrivateKey');
+        $this->session->remove('privateKey');
+        $this->session->remove('encryptionInitialized');
+        $this->session->remove('decryptAll');
+        $this->session->remove('decryptAllKey');
+        $this->session->remove('decryptAllUid');
+    }
 }

apps/dav/lib/DAV/Sharing/Plugin.php

Spacing +5 added lines, -5 removed lines

@@ -101,11 +101,11 @@ 
 	 */
 	public function initialize(Server $server) {
 		$this->server = $server;
-		$this->server->xml->elementMap['{' . Plugin::NS_OWNCLOUD . '}share'] = ShareRequest::class;
-		$this->server->xml->elementMap['{' . Plugin::NS_OWNCLOUD . '}invite'] = Invite::class;
+		$this->server->xml->elementMap['{'.Plugin::NS_OWNCLOUD.'}share'] = ShareRequest::class;
+		$this->server->xml->elementMap['{'.Plugin::NS_OWNCLOUD.'}invite'] = Invite::class;
 
 		$this->server->on('method:POST', [$this, 'httpPost']);
-		$this->server->on('propFind',    [$this, 'propFind']);
+		$this->server->on('propFind', [$this, 'propFind']);
 	}
 
 	/**
@@ -148,7 +148,7 @@ 
 
 			// Dealing with the 'share' document, which modified invitees on a
 			// calendar.
-			case '{' . self::NS_OWNCLOUD . '}share':
+			case '{'.self::NS_OWNCLOUD.'}share':
 
 				// We can only deal with IShareableCalendar objects
 				if (!$node instanceof IShareable) {
@@ -190,7 +190,7 @@ 
 	 */
 	public function propFind(PropFind $propFind, INode $node) {
 		if ($node instanceof IShareable) {
-			$propFind->handle('{' . Plugin::NS_OWNCLOUD . '}invite', function () use ($node) {
+			$propFind->handle('{'.Plugin::NS_OWNCLOUD.'}invite', function() use ($node) {
 				return new Invite(
 					$node->getShares()
 				);

Indentation +171 added lines, -171 removed lines

@@ -38,175 +38,175 @@
 use Sabre\HTTP\ResponseInterface;
 
 class Plugin extends ServerPlugin {
-	public const NS_OWNCLOUD = 'http://owncloud.org/ns';
-	public const NS_NEXTCLOUD = 'http://nextcloud.com/ns';
-
-	/** @var Auth */
-	private $auth;
-
-	/** @var IRequest */
-	private $request;
-
-	/** @var IConfig */
-	private $config;
-
-	/**
-	 * Plugin constructor.
-	 *
-	 * @param Auth $authBackEnd
-	 * @param IRequest $request
-	 * @param IConfig $config
-	 */
-	public function __construct(Auth $authBackEnd, IRequest $request, IConfig $config) {
-		$this->auth = $authBackEnd;
-		$this->request = $request;
-		$this->config = $config;
-	}
-
-	/**
-	 * Reference to SabreDAV server object.
-	 *
-	 * @var \Sabre\DAV\Server
-	 */
-	protected $server;
-
-	/**
-	 * This method should return a list of server-features.
-	 *
-	 * This is for example 'versioning' and is added to the DAV: header
-	 * in an OPTIONS response.
-	 *
-	 * @return string[]
-	 */
-	public function getFeatures() {
-		return ['oc-resource-sharing'];
-	}
-
-	/**
-	 * Returns a plugin name.
-	 *
-	 * Using this name other plugins will be able to access other plugins
-	 * using Sabre\DAV\Server::getPlugin
-	 *
-	 * @return string
-	 */
-	public function getPluginName() {
-		return 'oc-resource-sharing';
-	}
-
-	/**
-	 * This initializes the plugin.
-	 *
-	 * This function is called by Sabre\DAV\Server, after
-	 * addPlugin is called.
-	 *
-	 * This method should set up the required event subscriptions.
-	 *
-	 * @param Server $server
-	 * @return void
-	 */
-	public function initialize(Server $server) {
-		$this->server = $server;
-		$this->server->xml->elementMap['{' . Plugin::NS_OWNCLOUD . '}share'] = ShareRequest::class;
-		$this->server->xml->elementMap['{' . Plugin::NS_OWNCLOUD . '}invite'] = Invite::class;
-
-		$this->server->on('method:POST', [$this, 'httpPost']);
-		$this->server->on('propFind',    [$this, 'propFind']);
-	}
-
-	/**
-	 * We intercept this to handle POST requests on a dav resource.
-	 *
-	 * @param RequestInterface $request
-	 * @param ResponseInterface $response
-	 * @return null|false
-	 */
-	public function httpPost(RequestInterface $request, ResponseInterface $response) {
-		$path = $request->getPath();
-
-		// Only handling xml
-		$contentType = $request->getHeader('Content-Type');
-		if (strpos($contentType, 'application/xml') === false && strpos($contentType, 'text/xml') === false) {
-			return;
-		}
-
-		// Making sure the node exists
-		try {
-			$node = $this->server->tree->getNodeForPath($path);
-		} catch (NotFound $e) {
-			return;
-		}
-
-		$requestBody = $request->getBodyAsString();
-
-		// If this request handler could not deal with this POST request, it
-		// will return 'null' and other plugins get a chance to handle the
-		// request.
-		//
-		// However, we already requested the full body. This is a problem,
-		// because a body can only be read once. This is why we preemptively
-		// re-populated the request body with the existing data.
-		$request->setBody($requestBody);
-
-		$message = $this->server->xml->parse($requestBody, $request->getUrl(), $documentType);
-
-		switch ($documentType) {
-
-			// Dealing with the 'share' document, which modified invitees on a
-			// calendar.
-			case '{' . self::NS_OWNCLOUD . '}share':
-
-				// We can only deal with IShareableCalendar objects
-				if (!$node instanceof IShareable) {
-					return;
-				}
-
-				$this->server->transactionType = 'post-oc-resource-share';
-
-				// Getting ACL info
-				$acl = $this->server->getPlugin('acl');
-
-				// If there's no ACL support, we allow everything
-				if ($acl) {
-					/** @var \Sabre\DAVACL\Plugin $acl */
-					$acl->checkPrivileges($path, '{DAV:}write');
-
-					$limitSharingToOwner = $this->config->getAppValue('dav', 'limitAddressBookAndCalendarSharingToOwner', 'no') === 'yes';
-					$isOwner = $acl->getCurrentUserPrincipal() === $node->getOwner();
-					if ($limitSharingToOwner && !$isOwner) {
-						return;
-					}
-				}
-
-				$node->updateShares($message->set, $message->remove);
-
-				$response->setStatus(200);
-				// Adding this because sending a response body may cause issues,
-				// and I wanted some type of indicator the response was handled.
-				$response->setHeader('X-Sabre-Status', 'everything-went-well');
-
-				// Breaking the event chain
-				return false;
-		}
-	}
-
-	/**
-	 * This event is triggered when properties are requested for a certain
-	 * node.
-	 *
-	 * This allows us to inject any properties early.
-	 *
-	 * @param PropFind $propFind
-	 * @param INode $node
-	 * @return void
-	 */
-	public function propFind(PropFind $propFind, INode $node) {
-		if ($node instanceof IShareable) {
-			$propFind->handle('{' . Plugin::NS_OWNCLOUD . '}invite', function () use ($node) {
-				return new Invite(
-					$node->getShares()
-				);
-			});
-		}
-	}
+    public const NS_OWNCLOUD = 'http://owncloud.org/ns';
+    public const NS_NEXTCLOUD = 'http://nextcloud.com/ns';
+
+    /** @var Auth */
+    private $auth;
+
+    /** @var IRequest */
+    private $request;
+
+    /** @var IConfig */
+    private $config;
+
+    /**
+     * Plugin constructor.
+     *
+     * @param Auth $authBackEnd
+     * @param IRequest $request
+     * @param IConfig $config
+     */
+    public function __construct(Auth $authBackEnd, IRequest $request, IConfig $config) {
+        $this->auth = $authBackEnd;
+        $this->request = $request;
+        $this->config = $config;
+    }
+
+    /**
+     * Reference to SabreDAV server object.
+     *
+     * @var \Sabre\DAV\Server
+     */
+    protected $server;
+
+    /**
+     * This method should return a list of server-features.
+     *
+     * This is for example 'versioning' and is added to the DAV: header
+     * in an OPTIONS response.
+     *
+     * @return string[]
+     */
+    public function getFeatures() {
+        return ['oc-resource-sharing'];
+    }
+
+    /**
+     * Returns a plugin name.
+     *
+     * Using this name other plugins will be able to access other plugins
+     * using Sabre\DAV\Server::getPlugin
+     *
+     * @return string
+     */
+    public function getPluginName() {
+        return 'oc-resource-sharing';
+    }
+
+    /**
+     * This initializes the plugin.
+     *
+     * This function is called by Sabre\DAV\Server, after
+     * addPlugin is called.
+     *
+     * This method should set up the required event subscriptions.
+     *
+     * @param Server $server
+     * @return void
+     */
+    public function initialize(Server $server) {
+        $this->server = $server;
+        $this->server->xml->elementMap['{' . Plugin::NS_OWNCLOUD . '}share'] = ShareRequest::class;
+        $this->server->xml->elementMap['{' . Plugin::NS_OWNCLOUD . '}invite'] = Invite::class;
+
+        $this->server->on('method:POST', [$this, 'httpPost']);
+        $this->server->on('propFind',    [$this, 'propFind']);
+    }
+
+    /**
+     * We intercept this to handle POST requests on a dav resource.
+     *
+     * @param RequestInterface $request
+     * @param ResponseInterface $response
+     * @return null|false
+     */
+    public function httpPost(RequestInterface $request, ResponseInterface $response) {
+        $path = $request->getPath();
+
+        // Only handling xml
+        $contentType = $request->getHeader('Content-Type');
+        if (strpos($contentType, 'application/xml') === false && strpos($contentType, 'text/xml') === false) {
+            return;
+        }
+
+        // Making sure the node exists
+        try {
+            $node = $this->server->tree->getNodeForPath($path);
+        } catch (NotFound $e) {
+            return;
+        }
+
+        $requestBody = $request->getBodyAsString();
+
+        // If this request handler could not deal with this POST request, it
+        // will return 'null' and other plugins get a chance to handle the
+        // request.
+        //
+        // However, we already requested the full body. This is a problem,
+        // because a body can only be read once. This is why we preemptively
+        // re-populated the request body with the existing data.
+        $request->setBody($requestBody);
+
+        $message = $this->server->xml->parse($requestBody, $request->getUrl(), $documentType);
+
+        switch ($documentType) {
+
+            // Dealing with the 'share' document, which modified invitees on a
+            // calendar.
+            case '{' . self::NS_OWNCLOUD . '}share':
+
+                // We can only deal with IShareableCalendar objects
+                if (!$node instanceof IShareable) {
+                    return;
+                }
+
+                $this->server->transactionType = 'post-oc-resource-share';
+
+                // Getting ACL info
+                $acl = $this->server->getPlugin('acl');
+
+                // If there's no ACL support, we allow everything
+                if ($acl) {
+                    /** @var \Sabre\DAVACL\Plugin $acl */
+                    $acl->checkPrivileges($path, '{DAV:}write');
+
+                    $limitSharingToOwner = $this->config->getAppValue('dav', 'limitAddressBookAndCalendarSharingToOwner', 'no') === 'yes';
+                    $isOwner = $acl->getCurrentUserPrincipal() === $node->getOwner();
+                    if ($limitSharingToOwner && !$isOwner) {
+                        return;
+                    }
+                }
+
+                $node->updateShares($message->set, $message->remove);
+
+                $response->setStatus(200);
+                // Adding this because sending a response body may cause issues,
+                // and I wanted some type of indicator the response was handled.
+                $response->setHeader('X-Sabre-Status', 'everything-went-well');
+
+                // Breaking the event chain
+                return false;
+        }
+    }
+
+    /**
+     * This event is triggered when properties are requested for a certain
+     * node.
+     *
+     * This allows us to inject any properties early.
+     *
+     * @param PropFind $propFind
+     * @param INode $node
+     * @return void
+     */
+    public function propFind(PropFind $propFind, INode $node) {
+        if ($node instanceof IShareable) {
+            $propFind->handle('{' . Plugin::NS_OWNCLOUD . '}invite', function () use ($node) {
+                return new Invite(
+                    $node->getShares()
+                );
+            });
+        }
+    }
 }

apps/dav/lib/Connector/Sabre/ShareeList.php

Spacing +4 added lines, -4 removed lines

@@ -52,10 +52,10 @@
 	 */
 	public function xmlSerialize(Writer $writer) {
 		foreach ($this->shares as $share) {
-			$writer->startElement('{' . self::NS_NEXTCLOUD . '}sharee');
-			$writer->writeElement('{' . self::NS_NEXTCLOUD . '}id', $share->getSharedWith());
-			$writer->writeElement('{' . self::NS_NEXTCLOUD . '}display-name', $share->getSharedWithDisplayName());
-			$writer->writeElement('{' . self::NS_NEXTCLOUD . '}type', $share->getShareType());
+			$writer->startElement('{'.self::NS_NEXTCLOUD.'}sharee');
+			$writer->writeElement('{'.self::NS_NEXTCLOUD.'}id', $share->getSharedWith());
+			$writer->writeElement('{'.self::NS_NEXTCLOUD.'}display-name', $share->getSharedWithDisplayName());
+			$writer->writeElement('{'.self::NS_NEXTCLOUD.'}type', $share->getShareType());
 			$writer->endElement();
 		}
 	}

Indentation +21 added lines, -21 removed lines

@@ -35,28 +35,28 @@
  * This property contains multiple "sharee" elements, each containing a share sharee
  */
 class ShareeList implements XmlSerializable {
-	public const NS_NEXTCLOUD = 'http://nextcloud.org/ns';
+    public const NS_NEXTCLOUD = 'http://nextcloud.org/ns';
 
-	/** @var IShare[] */
-	private $shares;
+    /** @var IShare[] */
+    private $shares;
 
-	public function __construct(array $shares) {
-		$this->shares = $shares;
-	}
+    public function __construct(array $shares) {
+        $this->shares = $shares;
+    }
 
-	/**
-	 * The xmlSerialize method is called during xml writing.
-	 *
-	 * @param Writer $writer
-	 * @return void
-	 */
-	public function xmlSerialize(Writer $writer) {
-		foreach ($this->shares as $share) {
-			$writer->startElement('{' . self::NS_NEXTCLOUD . '}sharee');
-			$writer->writeElement('{' . self::NS_NEXTCLOUD . '}id', $share->getSharedWith());
-			$writer->writeElement('{' . self::NS_NEXTCLOUD . '}display-name', $share->getSharedWithDisplayName());
-			$writer->writeElement('{' . self::NS_NEXTCLOUD . '}type', $share->getShareType());
-			$writer->endElement();
-		}
-	}
+    /**
+     * The xmlSerialize method is called during xml writing.
+     *
+     * @param Writer $writer
+     * @return void
+     */
+    public function xmlSerialize(Writer $writer) {
+        foreach ($this->shares as $share) {
+            $writer->startElement('{' . self::NS_NEXTCLOUD . '}sharee');
+            $writer->writeElement('{' . self::NS_NEXTCLOUD . '}id', $share->getSharedWith());
+            $writer->writeElement('{' . self::NS_NEXTCLOUD . '}display-name', $share->getSharedWithDisplayName());
+            $writer->writeElement('{' . self::NS_NEXTCLOUD . '}type', $share->getShareType());
+            $writer->endElement();
+        }
+    }
 }