nextcloud / server

lib/private/Security/CSP/ContentSecurityPolicy.php

Spacing +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 /**
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  *

Indentation +181 added lines, -181 removed lines

@@ -31,186 +31,186 @@
  * @package OC\Security\CSP
  */
 class ContentSecurityPolicy extends \OCP\AppFramework\Http\ContentSecurityPolicy {
-	/**
-	 * @return boolean
-	 */
-	public function isInlineScriptAllowed(): bool {
-		return $this->inlineScriptAllowed;
-	}
-
-	/**
-	 * @param boolean $inlineScriptAllowed
-	 */
-	public function setInlineScriptAllowed(bool $inlineScriptAllowed) {
-		$this->inlineScriptAllowed = $inlineScriptAllowed;
-	}
-
-	/**
-	 * @return boolean
-	 */
-	public function isEvalScriptAllowed(): bool {
-		return $this->evalScriptAllowed;
-	}
-
-	/**
-	 * @param boolean $evalScriptAllowed
-	 */
-	public function setEvalScriptAllowed(bool $evalScriptAllowed) {
-		$this->evalScriptAllowed = $evalScriptAllowed;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getAllowedScriptDomains(): array {
-		return $this->allowedScriptDomains;
-	}
-
-	/**
-	 * @param array $allowedScriptDomains
-	 */
-	public function setAllowedScriptDomains(array $allowedScriptDomains) {
-		$this->allowedScriptDomains = $allowedScriptDomains;
-	}
-
-	/**
-	 * @return boolean
-	 */
-	public function isInlineStyleAllowed(): bool {
-		return $this->inlineStyleAllowed;
-	}
-
-	/**
-	 * @param boolean $inlineStyleAllowed
-	 */
-	public function setInlineStyleAllowed(bool $inlineStyleAllowed) {
-		$this->inlineStyleAllowed = $inlineStyleAllowed;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getAllowedStyleDomains(): array {
-		return $this->allowedStyleDomains;
-	}
-
-	/**
-	 * @param array $allowedStyleDomains
-	 */
-	public function setAllowedStyleDomains(array $allowedStyleDomains) {
-		$this->allowedStyleDomains = $allowedStyleDomains;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getAllowedImageDomains(): array {
-		return $this->allowedImageDomains;
-	}
-
-	/**
-	 * @param array $allowedImageDomains
-	 */
-	public function setAllowedImageDomains(array $allowedImageDomains) {
-		$this->allowedImageDomains = $allowedImageDomains;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getAllowedConnectDomains(): array {
-		return $this->allowedConnectDomains;
-	}
-
-	/**
-	 * @param array $allowedConnectDomains
-	 */
-	public function setAllowedConnectDomains(array $allowedConnectDomains) {
-		$this->allowedConnectDomains = $allowedConnectDomains;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getAllowedMediaDomains(): array {
-		return $this->allowedMediaDomains;
-	}
-
-	/**
-	 * @param array $allowedMediaDomains
-	 */
-	public function setAllowedMediaDomains(array $allowedMediaDomains) {
-		$this->allowedMediaDomains = $allowedMediaDomains;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getAllowedObjectDomains(): array {
-		return $this->allowedObjectDomains;
-	}
-
-	/**
-	 * @param array $allowedObjectDomains
-	 */
-	public function setAllowedObjectDomains(array $allowedObjectDomains) {
-		$this->allowedObjectDomains = $allowedObjectDomains;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getAllowedFrameDomains(): array {
-		return $this->allowedFrameDomains;
-	}
-
-	/**
-	 * @param array $allowedFrameDomains
-	 */
-	public function setAllowedFrameDomains(array $allowedFrameDomains) {
-		$this->allowedFrameDomains = $allowedFrameDomains;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getAllowedFontDomains(): array {
-		return $this->allowedFontDomains;
-	}
-
-	/**
-	 * @param array $allowedFontDomains
-	 */
-	public function setAllowedFontDomains($allowedFontDomains) {
-		$this->allowedFontDomains = $allowedFontDomains;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getAllowedChildSrcDomains(): array {
-		return $this->allowedChildSrcDomains;
-	}
-
-	/**
-	 * @param array $allowedChildSrcDomains
-	 */
-	public function setAllowedChildSrcDomains($allowedChildSrcDomains) {
-		$this->allowedChildSrcDomains = $allowedChildSrcDomains;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getAllowedFrameAncestors(): array {
-		return $this->allowedFrameAncestors;
-	}
-
-	/**
-	 * @param array $allowedFrameAncestors
-	 */
-	public function setAllowedFrameAncestors($allowedFrameAncestors) {
-		$this->allowedFrameAncestors = $allowedFrameAncestors;
-	}
+    /**
+     * @return boolean
+     */
+    public function isInlineScriptAllowed(): bool {
+        return $this->inlineScriptAllowed;
+    }
+
+    /**
+     * @param boolean $inlineScriptAllowed
+     */
+    public function setInlineScriptAllowed(bool $inlineScriptAllowed) {
+        $this->inlineScriptAllowed = $inlineScriptAllowed;
+    }
+
+    /**
+     * @return boolean
+     */
+    public function isEvalScriptAllowed(): bool {
+        return $this->evalScriptAllowed;
+    }
+
+    /**
+     * @param boolean $evalScriptAllowed
+     */
+    public function setEvalScriptAllowed(bool $evalScriptAllowed) {
+        $this->evalScriptAllowed = $evalScriptAllowed;
+    }
+
+    /**
+     * @return array
+     */
+    public function getAllowedScriptDomains(): array {
+        return $this->allowedScriptDomains;
+    }
+
+    /**
+     * @param array $allowedScriptDomains
+     */
+    public function setAllowedScriptDomains(array $allowedScriptDomains) {
+        $this->allowedScriptDomains = $allowedScriptDomains;
+    }
+
+    /**
+     * @return boolean
+     */
+    public function isInlineStyleAllowed(): bool {
+        return $this->inlineStyleAllowed;
+    }
+
+    /**
+     * @param boolean $inlineStyleAllowed
+     */
+    public function setInlineStyleAllowed(bool $inlineStyleAllowed) {
+        $this->inlineStyleAllowed = $inlineStyleAllowed;
+    }
+
+    /**
+     * @return array
+     */
+    public function getAllowedStyleDomains(): array {
+        return $this->allowedStyleDomains;
+    }
+
+    /**
+     * @param array $allowedStyleDomains
+     */
+    public function setAllowedStyleDomains(array $allowedStyleDomains) {
+        $this->allowedStyleDomains = $allowedStyleDomains;
+    }
+
+    /**
+     * @return array
+     */
+    public function getAllowedImageDomains(): array {
+        return $this->allowedImageDomains;
+    }
+
+    /**
+     * @param array $allowedImageDomains
+     */
+    public function setAllowedImageDomains(array $allowedImageDomains) {
+        $this->allowedImageDomains = $allowedImageDomains;
+    }
+
+    /**
+     * @return array
+     */
+    public function getAllowedConnectDomains(): array {
+        return $this->allowedConnectDomains;
+    }
+
+    /**
+     * @param array $allowedConnectDomains
+     */
+    public function setAllowedConnectDomains(array $allowedConnectDomains) {
+        $this->allowedConnectDomains = $allowedConnectDomains;
+    }
+
+    /**
+     * @return array
+     */
+    public function getAllowedMediaDomains(): array {
+        return $this->allowedMediaDomains;
+    }
+
+    /**
+     * @param array $allowedMediaDomains
+     */
+    public function setAllowedMediaDomains(array $allowedMediaDomains) {
+        $this->allowedMediaDomains = $allowedMediaDomains;
+    }
+
+    /**
+     * @return array
+     */
+    public function getAllowedObjectDomains(): array {
+        return $this->allowedObjectDomains;
+    }
+
+    /**
+     * @param array $allowedObjectDomains
+     */
+    public function setAllowedObjectDomains(array $allowedObjectDomains) {
+        $this->allowedObjectDomains = $allowedObjectDomains;
+    }
+
+    /**
+     * @return array
+     */
+    public function getAllowedFrameDomains(): array {
+        return $this->allowedFrameDomains;
+    }
+
+    /**
+     * @param array $allowedFrameDomains
+     */
+    public function setAllowedFrameDomains(array $allowedFrameDomains) {
+        $this->allowedFrameDomains = $allowedFrameDomains;
+    }
+
+    /**
+     * @return array
+     */
+    public function getAllowedFontDomains(): array {
+        return $this->allowedFontDomains;
+    }
+
+    /**
+     * @param array $allowedFontDomains
+     */
+    public function setAllowedFontDomains($allowedFontDomains) {
+        $this->allowedFontDomains = $allowedFontDomains;
+    }
+
+    /**
+     * @return array
+     */
+    public function getAllowedChildSrcDomains(): array {
+        return $this->allowedChildSrcDomains;
+    }
+
+    /**
+     * @param array $allowedChildSrcDomains
+     */
+    public function setAllowedChildSrcDomains($allowedChildSrcDomains) {
+        $this->allowedChildSrcDomains = $allowedChildSrcDomains;
+    }
+
+    /**
+     * @return array
+     */
+    public function getAllowedFrameAncestors(): array {
+        return $this->allowedFrameAncestors;
+    }
+
+    /**
+     * @param array $allowedFrameAncestors
+     */
+    public function setAllowedFrameAncestors($allowedFrameAncestors) {
+        $this->allowedFrameAncestors = $allowedFrameAncestors;
+    }
 
 }

lib/private/Security/CSP/ContentSecurityPolicyManager.php

Indentation +40 added lines, -40 removed lines

@@ -28,48 +28,48 @@
 use OCP\Security\IContentSecurityPolicyManager;
 
 class ContentSecurityPolicyManager implements IContentSecurityPolicyManager {
-	/** @var ContentSecurityPolicy[] */
-	private $policies = [];
+    /** @var ContentSecurityPolicy[] */
+    private $policies = [];
 
-	/** {@inheritdoc} */
-	public function addDefaultPolicy(EmptyContentSecurityPolicy $policy) {
-		$this->policies[] = $policy;
-	}
+    /** {@inheritdoc} */
+    public function addDefaultPolicy(EmptyContentSecurityPolicy $policy) {
+        $this->policies[] = $policy;
+    }
 
-	/**
-	 * Get the configured default policy. This is not in the public namespace
-	 * as it is only supposed to be used by core itself.
-	 *
-	 * @return ContentSecurityPolicy
-	 */
-	public function getDefaultPolicy(): ContentSecurityPolicy {
-		$defaultPolicy = new \OC\Security\CSP\ContentSecurityPolicy();
-		foreach($this->policies as $policy) {
-			$defaultPolicy = $this->mergePolicies($defaultPolicy, $policy);
-		}
-		return $defaultPolicy;
-	}
+    /**
+     * Get the configured default policy. This is not in the public namespace
+     * as it is only supposed to be used by core itself.
+     *
+     * @return ContentSecurityPolicy
+     */
+    public function getDefaultPolicy(): ContentSecurityPolicy {
+        $defaultPolicy = new \OC\Security\CSP\ContentSecurityPolicy();
+        foreach($this->policies as $policy) {
+            $defaultPolicy = $this->mergePolicies($defaultPolicy, $policy);
+        }
+        return $defaultPolicy;
+    }
 
-	/**
-	 * Merges the first given policy with the second one
-	 *
-	 * @param ContentSecurityPolicy $defaultPolicy
-	 * @param EmptyContentSecurityPolicy $originalPolicy
-	 * @return ContentSecurityPolicy
-	 */
-	public function mergePolicies(ContentSecurityPolicy $defaultPolicy,
-								  EmptyContentSecurityPolicy $originalPolicy): ContentSecurityPolicy {
-		foreach((object)(array)$originalPolicy as $name => $value) {
-			$setter = 'set'.ucfirst($name);
-			if(\is_array($value)) {
-				$getter = 'get'.ucfirst($name);
-				$currentValues = \is_array($defaultPolicy->$getter()) ? $defaultPolicy->$getter() : [];
-				$defaultPolicy->$setter(array_values(array_unique(array_merge($currentValues, $value))));
-			} elseif (\is_bool($value)) {
-				$defaultPolicy->$setter($value);
-			}
-		}
+    /**
+     * Merges the first given policy with the second one
+     *
+     * @param ContentSecurityPolicy $defaultPolicy
+     * @param EmptyContentSecurityPolicy $originalPolicy
+     * @return ContentSecurityPolicy
+     */
+    public function mergePolicies(ContentSecurityPolicy $defaultPolicy,
+                                    EmptyContentSecurityPolicy $originalPolicy): ContentSecurityPolicy {
+        foreach((object)(array)$originalPolicy as $name => $value) {
+            $setter = 'set'.ucfirst($name);
+            if(\is_array($value)) {
+                $getter = 'get'.ucfirst($name);
+                $currentValues = \is_array($defaultPolicy->$getter()) ? $defaultPolicy->$getter() : [];
+                $defaultPolicy->$setter(array_values(array_unique(array_merge($currentValues, $value))));
+            } elseif (\is_bool($value)) {
+                $defaultPolicy->$setter($value);
+            }
+        }
 
-		return $defaultPolicy;
-	}
+        return $defaultPolicy;
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 /**
  * @copyright Copyright (c) 2016, ownCloud, Inc.
  *
@@ -44,7 +44,7 @@ 
 	 */
 	public function getDefaultPolicy(): ContentSecurityPolicy {
 		$defaultPolicy = new \OC\Security\CSP\ContentSecurityPolicy();
-		foreach($this->policies as $policy) {
+		foreach ($this->policies as $policy) {
 			$defaultPolicy = $this->mergePolicies($defaultPolicy, $policy);
 		}
 		return $defaultPolicy;
@@ -59,9 +59,9 @@ 
 	 */
 	public function mergePolicies(ContentSecurityPolicy $defaultPolicy,
 								  EmptyContentSecurityPolicy $originalPolicy): ContentSecurityPolicy {
-		foreach((object)(array)$originalPolicy as $name => $value) {
+		foreach ((object) (array) $originalPolicy as $name => $value) {
 			$setter = 'set'.ucfirst($name);
-			if(\is_array($value)) {
+			if (\is_array($value)) {
 				$getter = 'get'.ucfirst($name);
 				$currentValues = \is_array($defaultPolicy->$getter()) ? $defaultPolicy->$getter() : [];
 				$defaultPolicy->$setter(array_values(array_unique(array_merge($currentValues, $value))));

lib/private/Security/CSP/ContentSecurityPolicyNonceManager.php

Indentation +42 added lines, -42 removed lines

@@ -34,52 +34,52 @@
  * @package OC\Security\CSP
  */
 class ContentSecurityPolicyNonceManager {
-	/** @var CsrfTokenManager */
-	private $csrfTokenManager;
-	/** @var IRequest */
-	private $request;
-	/** @var string */
-	private $nonce = '';
+    /** @var CsrfTokenManager */
+    private $csrfTokenManager;
+    /** @var IRequest */
+    private $request;
+    /** @var string */
+    private $nonce = '';
 
-	/**
-	 * @param CsrfTokenManager $csrfTokenManager
-	 * @param IRequest $request
-	 */
-	public function __construct(CsrfTokenManager $csrfTokenManager,
-								IRequest $request) {
-		$this->csrfTokenManager = $csrfTokenManager;
-		$this->request = $request;
-	}
+    /**
+     * @param CsrfTokenManager $csrfTokenManager
+     * @param IRequest $request
+     */
+    public function __construct(CsrfTokenManager $csrfTokenManager,
+                                IRequest $request) {
+        $this->csrfTokenManager = $csrfTokenManager;
+        $this->request = $request;
+    }
 
-	/**
-	 * Returns the current CSP nounce
-	 *
-	 * @return string
-	 */
-	public function getNonce(): string {
-		if($this->nonce === '') {
-			$this->nonce = base64_encode($this->csrfTokenManager->getToken()->getEncryptedValue());
-		}
+    /**
+     * Returns the current CSP nounce
+     *
+     * @return string
+     */
+    public function getNonce(): string {
+        if($this->nonce === '') {
+            $this->nonce = base64_encode($this->csrfTokenManager->getToken()->getEncryptedValue());
+        }
 
-		return $this->nonce;
-	}
+        return $this->nonce;
+    }
 
-	/**
-	 * Check if the browser supports CSP v3
-	 *
-	 * @return bool
-	 */
-	public function browserSupportsCspV3(): bool {
-		$browserWhitelist = [
-			Request::USER_AGENT_CHROME,
-			// Firefox 45+
-			'/^Mozilla\/5\.0 \([^)]+\) Gecko\/[0-9.]+ Firefox\/(4[5-9]|[5-9][0-9])\.[0-9.]+$/',
-		];
+    /**
+     * Check if the browser supports CSP v3
+     *
+     * @return bool
+     */
+    public function browserSupportsCspV3(): bool {
+        $browserWhitelist = [
+            Request::USER_AGENT_CHROME,
+            // Firefox 45+
+            '/^Mozilla\/5\.0 \([^)]+\) Gecko\/[0-9.]+ Firefox\/(4[5-9]|[5-9][0-9])\.[0-9.]+$/',
+        ];
 
-		if($this->request->isUserAgent($browserWhitelist)) {
-			return true;
-		}
+        if($this->request->isUserAgent($browserWhitelist)) {
+            return true;
+        }
 
-		return false;
-	}
+        return false;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-declare(strict_types=1);
+declare(strict_types = 1);
 /**
  * @copyright Copyright (c) 2016 Lukas Reschke <lukas@statuscode.ch>
  *
@@ -57,7 +57,7 @@ 
 	 * @return string
 	 */
 	public function getNonce(): string {
-		if($this->nonce === '') {
+		if ($this->nonce === '') {
 			$this->nonce = base64_encode($this->csrfTokenManager->getToken()->getEncryptedValue());
 		}
 
@@ -76,7 +76,7 @@ 
 			'/^Mozilla\/5\.0 \([^)]+\) Gecko\/[0-9.]+ Firefox\/(4[5-9]|[5-9][0-9])\.[0-9.]+$/',
 		];
 
-		if($this->request->isUserAgent($browserWhitelist)) {
+		if ($this->request->isUserAgent($browserWhitelist)) {
 			return true;
 		}