View GitHub Repository server

Schedule Inspection
Subscribe
Passed
Push — master ( f29569...0ffa59 )
by Roeland
12:37 queued 01:56
created
Status
Category
Toggle Patches
lib/private/Security/CSP/ContentSecurityPolicyNonceManager.php 2 patches
Indentation   +48 added lines, -48 removed lines patch added patch discarded remove patch 
@@ -37,58 +37,58 @@
 
 block discarded – undo
37 37 
  * @package OC\Security\CSP
38 38 
  */
39 39 
 class ContentSecurityPolicyNonceManager {
40 
-	/** @var CsrfTokenManager */
41 
-	private $csrfTokenManager;
42 
-	/** @var IRequest */
43 
-	private $request;
44 
-	/** @var string */
45 
-	private $nonce = '';
40 
+    /** @var CsrfTokenManager */
41 
+    private $csrfTokenManager;
42 
+    /** @var IRequest */
43 
+    private $request;
44 
+    /** @var string */
45 
+    private $nonce = '';
46 46
47 
-	/**
48 
-	 * @param CsrfTokenManager $csrfTokenManager
49 
-	 * @param IRequest $request
50 
-	 */
51 
-	public function __construct(CsrfTokenManager $csrfTokenManager,
52 
-								IRequest $request) {
53 
-		$this->csrfTokenManager = $csrfTokenManager;
54 
-		$this->request = $request;
55 
-	}
47 
+    /**
48 
+     * @param CsrfTokenManager $csrfTokenManager
49 
+     * @param IRequest $request
50 
+     */
51 
+    public function __construct(CsrfTokenManager $csrfTokenManager,
52 
+                                IRequest $request) {
53 
+        $this->csrfTokenManager = $csrfTokenManager;
54 
+        $this->request = $request;
55 
+    }
56 56
57 
-	/**
58 
-	 * Returns the current CSP nounce
59 
-	 *
60 
-	 * @return string
61 
-	 */
62 
-	public function getNonce(): string {
63 
-		if($this->nonce === '') {
64 
-			if (empty($this->request->server['CSP_NONCE'])) {
65 
-				$this->nonce = base64_encode($this->csrfTokenManager->getToken()->getEncryptedValue());
66 
-			} else {
67 
-				$this->nonce = $this->request->server['CSP_NONCE'];
68 
-			}
69 
-		}
57 
+    /**
58 
+     * Returns the current CSP nounce
59 
+     *
60 
+     * @return string
61 
+     */
62 
+    public function getNonce(): string {
63 
+        if($this->nonce === '') {
64 
+            if (empty($this->request->server['CSP_NONCE'])) {
65 
+                $this->nonce = base64_encode($this->csrfTokenManager->getToken()->getEncryptedValue());
66 
+            } else {
67 
+                $this->nonce = $this->request->server['CSP_NONCE'];
68 
+            }
69 
+        }
70 70
71 
-		return $this->nonce;
72 
-	}
71 
+        return $this->nonce;
72 
+    }
73 73
74 
-	/**
75 
-	 * Check if the browser supports CSP v3
76 
-	 *
77 
-	 * @return bool
78 
-	 */
79 
-	public function browserSupportsCspV3(): bool {
80 
-		$browserWhitelist = [
81 
-			Request::USER_AGENT_CHROME,
82 
-			// Firefox 45+
83 
-			'/^Mozilla\/5\.0 \([^)]+\) Gecko\/[0-9.]+ Firefox\/(4[5-9]|[5-9][0-9])\.[0-9.]+$/',
84 
-			// Safari 12+
85 
-			'/^Mozilla\/5\.0 \([^)]+\) AppleWebKit\/[0-9.]+ \(KHTML, like Gecko\) Version\/(?:1[2-9]|[2-9][0-9])\.[0-9]+(?:\.[0-9]+)? Safari\/[0-9.A-Z]+$/',
86 
-		];
74 
+    /**
75 
+     * Check if the browser supports CSP v3
76 
+     *
77 
+     * @return bool
78 
+     */
79 
+    public function browserSupportsCspV3(): bool {
80 
+        $browserWhitelist = [
81 
+            Request::USER_AGENT_CHROME,
82 
+            // Firefox 45+
83 
+            '/^Mozilla\/5\.0 \([^)]+\) Gecko\/[0-9.]+ Firefox\/(4[5-9]|[5-9][0-9])\.[0-9.]+$/',
84 
+            // Safari 12+
85 
+            '/^Mozilla\/5\.0 \([^)]+\) AppleWebKit\/[0-9.]+ \(KHTML, like Gecko\) Version\/(?:1[2-9]|[2-9][0-9])\.[0-9]+(?:\.[0-9]+)? Safari\/[0-9.A-Z]+$/',
86 
+        ];
87 87
88 
-		if($this->request->isUserAgent($browserWhitelist)) {
89 
-			return true;
90 
-		}
88 
+        if($this->request->isUserAgent($browserWhitelist)) {
89 
+            return true;
90 
+        }
91 91
92 
-		return false;
93 
-	}
92 
+        return false;
93 
+    }
94 94 
 }
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -60,7 +60,7 @@  discard block
 
 block discarded – undo
60 60 
 	 * @return string
61 61 
 	 */
62 62 
 	public function getNonce(): string {
63 
-		if($this->nonce === '') {
63 
+		if ($this->nonce === '') {
64 64 
 			if (empty($this->request->server['CSP_NONCE'])) {
65 65 
 				$this->nonce = base64_encode($this->csrfTokenManager->getToken()->getEncryptedValue());
66 66 
 			} else {
 
@@ -85,7 +85,7 @@  discard block
 
 block discarded – undo
85 85 
 			'/^Mozilla\/5\.0 \([^)]+\) AppleWebKit\/[0-9.]+ \(KHTML, like Gecko\) Version\/(?:1[2-9]|[2-9][0-9])\.[0-9]+(?:\.[0-9]+)? Safari\/[0-9.A-Z]+$/',
86 86 
 		];
87 87
88 
-		if($this->request->isUserAgent($browserWhitelist)) {
88 
+		if ($this->request->isUserAgent($browserWhitelist)) {
89 89 
 			return true;
90 90 
 		}
91 91
Please login to merge, or discard this patch.