Inspection of "Merge pull request #15308 from nextcloud/fix/13550..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( ddff72...a2ad5d )

by Morris

created 2019-05-08 13:51 UTC

Status

Indentation +147 added lines, -147 removed lines patch added patch discarded remove patch

@@ -26,151 +26,151 @@
 block discarded – undo
 use OC\Setup;
 
 class ExceptionSerializer {
-	const methodsWithSensitiveParameters = [
-		// Session/User
-		'completeLogin',
-		'login',
-		'checkPassword',
-		'checkPasswordNoLogging',
-		'loginWithPassword',
-		'updatePrivateKeyPassword',
-		'validateUserPass',
-		'loginWithToken',
-		'{closure}',
-		'createSessionToken',
-
-		// Provisioning
-		'addUser',
-
-		// TokenProvider
-		'getToken',
-		'isTokenPassword',
-		'getPassword',
-		'decryptPassword',
-		'logClientIn',
-		'generateToken',
-		'validateToken',
-
-		// TwoFactorAuth
-		'solveChallenge',
-		'verifyChallenge',
-
-		// ICrypto
-		'calculateHMAC',
-		'encrypt',
-		'decrypt',
-
-		// LoginController
-		'tryLogin',
-		'confirmPassword',
-
-		// LDAP
-		'bind',
-		'areCredentialsValid',
-		'invokeLDAPMethod',
-
-		// Encryption
-		'storeKeyPair',
-		'setupUser',
-
-		// files_external: OC_Mount_Config
-		'getBackendStatus',
-
-		// files_external: UserStoragesController
-		'update',
-	];
-
-	const methodsWithSensitiveParametersByClass = [
-		SetupController::class => [
-			'run',
-			'display',
-			'loadAutoConfig',
-		],
-		Setup::class => [
-			'install'
-		]
-	];
-
-	private function editTrace(array &$sensitiveValues, array $traceLine): array {
-		$sensitiveValues = array_merge($sensitiveValues, $traceLine['args']);
-		$traceLine['args'] = ['*** sensitive parameters replaced ***'];
-		return $traceLine;
-	}
-
-	private function filterTrace(array $trace) {
-		$sensitiveValues = [];
-		$trace = array_map(function (array $traceLine) use (&$sensitiveValues) {
-			$className = $traceLine['class'] ?? '';
-			if ($className && isset(self::methodsWithSensitiveParametersByClass[$className])
-				&& in_array($traceLine['function'], self::methodsWithSensitiveParametersByClass[$className], true)) {
-				return $this->editTrace($sensitiveValues, $traceLine);
-			}
-			foreach (self::methodsWithSensitiveParameters as $sensitiveMethod) {
-				if (strpos($traceLine['function'], $sensitiveMethod) !== false) {
-					return $this->editTrace($sensitiveValues, $traceLine);
-				}
-			}
-			return $traceLine;
-		}, $trace);
-		return array_map(function (array $traceLine) use ($sensitiveValues) {
-			if (isset($traceLine['args'])) {
-				$traceLine['args'] = $this->removeValuesFromArgs($traceLine['args'], $sensitiveValues);
-			}
-			return $traceLine;
-		}, $trace);
-	}
-
-	private function removeValuesFromArgs($args, $values) {
-		foreach ($args as &$arg) {
-			if (in_array($arg, $values, true)) {
-				$arg = '*** sensitive parameter replaced ***';
-			} else if (is_array($arg)) {
-				$arg = $this->removeValuesFromArgs($arg, $values);
-			}
-		}
-		return $args;
-	}
-
-	private function encodeTrace($trace) {
-		$filteredTrace = $this->filterTrace($trace);
-		return array_map(function (array $line) {
-			if (isset($line['args'])) {
-				$line['args'] = array_map([$this, 'encodeArg'], $line['args']);
-			}
-			return $line;
-		}, $filteredTrace);
-	}
-
-	private function encodeArg($arg) {
-		if (is_object($arg)) {
-			$data = get_object_vars($arg);
-			$data['__class__'] = get_class($arg);
-			return array_map([$this, 'encodeArg'], $data);
-		} else if (is_array($arg)) {
-			return array_map([$this, 'encodeArg'], $arg);
-		} else {
-			return $arg;
-		}
-	}
-
-	public function serializeException(\Throwable $exception) {
-		$data = [
-			'Exception' => get_class($exception),
-			'Message' => $exception->getMessage(),
-			'Code' => $exception->getCode(),
-			'Trace' => $this->encodeTrace($exception->getTrace()),
-			'File' => $exception->getFile(),
-			'Line' => $exception->getLine(),
-		];
-
-		if ($exception instanceof HintException) {
-			$data['Hint'] = $exception->getHint();
-		}
-
-		if ($exception->getPrevious()) {
-			$data['Previous'] = $this->serializeException($exception->getPrevious());
-		}
-
-		return $data;
-	}
+    const methodsWithSensitiveParameters = [
+        // Session/User
+        'completeLogin',
+        'login',
+        'checkPassword',
+        'checkPasswordNoLogging',
+        'loginWithPassword',
+        'updatePrivateKeyPassword',
+        'validateUserPass',
+        'loginWithToken',
+        '{closure}',
+        'createSessionToken',
+
+        // Provisioning
+        'addUser',
+
+        // TokenProvider
+        'getToken',
+        'isTokenPassword',
+        'getPassword',
+        'decryptPassword',
+        'logClientIn',
+        'generateToken',
+        'validateToken',
+
+        // TwoFactorAuth
+        'solveChallenge',
+        'verifyChallenge',
+
+        // ICrypto
+        'calculateHMAC',
+        'encrypt',
+        'decrypt',
+
+        // LoginController
+        'tryLogin',
+        'confirmPassword',
+
+        // LDAP
+        'bind',
+        'areCredentialsValid',
+        'invokeLDAPMethod',
+
+        // Encryption
+        'storeKeyPair',
+        'setupUser',
+
+        // files_external: OC_Mount_Config
+        'getBackendStatus',
+
+        // files_external: UserStoragesController
+        'update',
+    ];
+
+    const methodsWithSensitiveParametersByClass = [
+        SetupController::class => [
+            'run',
+            'display',
+            'loadAutoConfig',
+        ],
+        Setup::class => [
+            'install'
+        ]
+    ];
+
+    private function editTrace(array &$sensitiveValues, array $traceLine): array {
+        $sensitiveValues = array_merge($sensitiveValues, $traceLine['args']);
+        $traceLine['args'] = ['*** sensitive parameters replaced ***'];
+        return $traceLine;
+    }
+
+    private function filterTrace(array $trace) {
+        $sensitiveValues = [];
+        $trace = array_map(function (array $traceLine) use (&$sensitiveValues) {
+            $className = $traceLine['class'] ?? '';
+            if ($className && isset(self::methodsWithSensitiveParametersByClass[$className])
+                && in_array($traceLine['function'], self::methodsWithSensitiveParametersByClass[$className], true)) {
+                return $this->editTrace($sensitiveValues, $traceLine);
+            }
+            foreach (self::methodsWithSensitiveParameters as $sensitiveMethod) {
+                if (strpos($traceLine['function'], $sensitiveMethod) !== false) {
+                    return $this->editTrace($sensitiveValues, $traceLine);
+                }
+            }
+            return $traceLine;
+        }, $trace);
+        return array_map(function (array $traceLine) use ($sensitiveValues) {
+            if (isset($traceLine['args'])) {
+                $traceLine['args'] = $this->removeValuesFromArgs($traceLine['args'], $sensitiveValues);
+            }
+            return $traceLine;
+        }, $trace);
+    }
+
+    private function removeValuesFromArgs($args, $values) {
+        foreach ($args as &$arg) {
+            if (in_array($arg, $values, true)) {
+                $arg = '*** sensitive parameter replaced ***';
+            } else if (is_array($arg)) {
+                $arg = $this->removeValuesFromArgs($arg, $values);
+            }
+        }
+        return $args;
+    }
+
+    private function encodeTrace($trace) {
+        $filteredTrace = $this->filterTrace($trace);
+        return array_map(function (array $line) {
+            if (isset($line['args'])) {
+                $line['args'] = array_map([$this, 'encodeArg'], $line['args']);
+            }
+            return $line;
+        }, $filteredTrace);
+    }
+
+    private function encodeArg($arg) {
+        if (is_object($arg)) {
+            $data = get_object_vars($arg);
+            $data['__class__'] = get_class($arg);
+            return array_map([$this, 'encodeArg'], $data);
+        } else if (is_array($arg)) {
+            return array_map([$this, 'encodeArg'], $arg);
+        } else {
+            return $arg;
+        }
+    }
+
+    public function serializeException(\Throwable $exception) {
+        $data = [
+            'Exception' => get_class($exception),
+            'Message' => $exception->getMessage(),
+            'Code' => $exception->getCode(),
+            'Trace' => $this->encodeTrace($exception->getTrace()),
+            'File' => $exception->getFile(),
+            'Line' => $exception->getLine(),
+        ];
+
+        if ($exception instanceof HintException) {
+            $data['Hint'] = $exception->getHint();
+        }
+
+        if ($exception->getPrevious()) {
+            $data['Previous'] = $this->serializeException($exception->getPrevious());
+        }
+
+        return $data;
+    }
 }

Please login to merge, or discard this patch.

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -99,7 +99,7 @@  discard block
 block discarded – undo
 
 	private function filterTrace(array $trace) {
 		$sensitiveValues = [];
-		$trace = array_map(function (array $traceLine) use (&$sensitiveValues) {
+		$trace = array_map(function(array $traceLine) use (&$sensitiveValues) {
 			$className = $traceLine['class'] ?? '';
 			if ($className && isset(self::methodsWithSensitiveParametersByClass[$className])
 				&& in_array($traceLine['function'], self::methodsWithSensitiveParametersByClass[$className], true)) {
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
 			}
 			return $traceLine;
 		}, $trace);
-		return array_map(function (array $traceLine) use ($sensitiveValues) {
+		return array_map(function(array $traceLine) use ($sensitiveValues) {
 			if (isset($traceLine['args'])) {
 				$traceLine['args'] = $this->removeValuesFromArgs($traceLine['args'], $sensitiveValues);
 			}
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
 
 	private function encodeTrace($trace) {
 		$filteredTrace = $this->filterTrace($trace);
-		return array_map(function (array $line) {
+		return array_map(function(array $line) {
 			if (isset($line['args'])) {
 				$line['args'] = array_map([$this, 'encodeArg'], $line['args']);
 			}

Please login to merge, or discard this patch.

		@@ -99,7 +99,7 @@ discard block
		block discarded – undo
99	99
100	100	private function filterTrace(array $trace) {
101	101	$sensitiveValues = [];
102		- $trace = array_map(function (array $traceLine) use (&$sensitiveValues) {
	102	+ $trace = array_map(function(array $traceLine) use (&$sensitiveValues) {
103	103	$className = $traceLine['class'] ?? '';
104	104	if ($className && isset(self::methodsWithSensitiveParametersByClass[$className])
105	105	&& in_array($traceLine['function'], self::methodsWithSensitiveParametersByClass[$className], true)) {
		@@ -112,7 +112,7 @@ discard block
		block discarded – undo
112	112	}
113	113	return $traceLine;
114	114	}, $trace);
115		- return array_map(function (array $traceLine) use ($sensitiveValues) {
	115	+ return array_map(function(array $traceLine) use ($sensitiveValues) {
116	116	if (isset($traceLine['args'])) {
117	117	$traceLine['args'] = $this->removeValuesFromArgs($traceLine['args'], $sensitiveValues);
118	118	}
		@@ -133,7 +133,7 @@ discard block
		block discarded – undo
133	133
134	134	private function encodeTrace($trace) {
135	135	$filteredTrace = $this->filterTrace($trace);
136		- return array_map(function (array $line) {
	136	+ return array_map(function(array $line) {
137	137	if (isset($line['args'])) {
138	138	$line['args'] = array_map([$this, 'encodeArg'], $line['args']);
139	139	}

		@@ -26,151 +26,151 @@
		block discarded – undo
26	26	use OC\Setup;
27	27
28	28	class ExceptionSerializer {
29		- const methodsWithSensitiveParameters = [
30		- // Session/User
31		- 'completeLogin',
32		- 'login',
33		- 'checkPassword',
34		- 'checkPasswordNoLogging',
35		- 'loginWithPassword',
36		- 'updatePrivateKeyPassword',
37		- 'validateUserPass',
38		- 'loginWithToken',
39		- '{closure}',
40		- 'createSessionToken',
41		-
42		- // Provisioning
43		- 'addUser',
44		-
45		- // TokenProvider
46		- 'getToken',
47		- 'isTokenPassword',
48		- 'getPassword',
49		- 'decryptPassword',
50		- 'logClientIn',
51		- 'generateToken',
52		- 'validateToken',
53		-
54		- // TwoFactorAuth
55		- 'solveChallenge',
56		- 'verifyChallenge',
57		-
58		- // ICrypto
59		- 'calculateHMAC',
60		- 'encrypt',
61		- 'decrypt',
62		-
63		- // LoginController
64		- 'tryLogin',
65		- 'confirmPassword',
66		-
67		- // LDAP
68		- 'bind',
69		- 'areCredentialsValid',
70		- 'invokeLDAPMethod',
71		-
72		- // Encryption
73		- 'storeKeyPair',
74		- 'setupUser',
75		-
76		- // files_external: OC_Mount_Config
77		- 'getBackendStatus',
78		-
79		- // files_external: UserStoragesController
80		- 'update',
81		- ];
82		-
83		- const methodsWithSensitiveParametersByClass = [
84		- SetupController::class => [
85		- 'run',
86		- 'display',
87		- 'loadAutoConfig',
88		- ],
89		- Setup::class => [
90		- 'install'
91		- ]
92		- ];
93		-
94		- private function editTrace(array &$sensitiveValues, array $traceLine): array {
95		- $sensitiveValues = array_merge($sensitiveValues, $traceLine['args']);
96		- $traceLine['args'] = ['* sensitive parameters replaced *'];
97		- return $traceLine;
98		- }
99		-
100		- private function filterTrace(array $trace) {
101		- $sensitiveValues = [];
102		- $trace = array_map(function (array $traceLine) use (&$sensitiveValues) {
103		- $className = $traceLine['class'] ?? '';
104		- if ($className && isset(self::methodsWithSensitiveParametersByClass[$className])
105		- && in_array($traceLine['function'], self::methodsWithSensitiveParametersByClass[$className], true)) {
106		- return $this->editTrace($sensitiveValues, $traceLine);
107		- }
108		- foreach (self::methodsWithSensitiveParameters as $sensitiveMethod) {
109		- if (strpos($traceLine['function'], $sensitiveMethod) !== false) {
110		- return $this->editTrace($sensitiveValues, $traceLine);
111		- }
112		- }
113		- return $traceLine;
114		- }, $trace);
115		- return array_map(function (array $traceLine) use ($sensitiveValues) {
116		- if (isset($traceLine['args'])) {
117		- $traceLine['args'] = $this->removeValuesFromArgs($traceLine['args'], $sensitiveValues);
118		- }
119		- return $traceLine;
120		- }, $trace);
121		- }
122		-
123		- private function removeValuesFromArgs($args, $values) {
124		- foreach ($args as &$arg) {
125		- if (in_array($arg, $values, true)) {
126		- $arg = '* sensitive parameter replaced *';
127		- } else if (is_array($arg)) {
128		- $arg = $this->removeValuesFromArgs($arg, $values);
129		- }
130		- }
131		- return $args;
132		- }
133		-
134		- private function encodeTrace($trace) {
135		- $filteredTrace = $this->filterTrace($trace);
136		- return array_map(function (array $line) {
137		- if (isset($line['args'])) {
138		- $line['args'] = array_map([$this, 'encodeArg'], $line['args']);
139		- }
140		- return $line;
141		- }, $filteredTrace);
142		- }
143		-
144		- private function encodeArg($arg) {
145		- if (is_object($arg)) {
146		- $data = get_object_vars($arg);
147		- $data['__class__'] = get_class($arg);
148		- return array_map([$this, 'encodeArg'], $data);
149		- } else if (is_array($arg)) {
150		- return array_map([$this, 'encodeArg'], $arg);
151		- } else {
152		- return $arg;
153		- }
154		- }
155		-
156		- public function serializeException(\Throwable $exception) {
157		- $data = [
158		- 'Exception' => get_class($exception),
159		- 'Message' => $exception->getMessage(),
160		- 'Code' => $exception->getCode(),
161		- 'Trace' => $this->encodeTrace($exception->getTrace()),
162		- 'File' => $exception->getFile(),
163		- 'Line' => $exception->getLine(),
164		- ];
165		-
166		- if ($exception instanceof HintException) {
167		- $data['Hint'] = $exception->getHint();
168		- }
169		-
170		- if ($exception->getPrevious()) {
171		- $data['Previous'] = $this->serializeException($exception->getPrevious());
172		- }
173		-
174		- return $data;
175		- }
	29	+ const methodsWithSensitiveParameters = [
	30	+ // Session/User
	31	+ 'completeLogin',
	32	+ 'login',
	33	+ 'checkPassword',
	34	+ 'checkPasswordNoLogging',
	35	+ 'loginWithPassword',
	36	+ 'updatePrivateKeyPassword',
	37	+ 'validateUserPass',
	38	+ 'loginWithToken',
	39	+ '{closure}',
	40	+ 'createSessionToken',
	41	+
	42	+ // Provisioning
	43	+ 'addUser',
	44	+
	45	+ // TokenProvider
	46	+ 'getToken',
	47	+ 'isTokenPassword',
	48	+ 'getPassword',
	49	+ 'decryptPassword',
	50	+ 'logClientIn',
	51	+ 'generateToken',
	52	+ 'validateToken',
	53	+
	54	+ // TwoFactorAuth
	55	+ 'solveChallenge',
	56	+ 'verifyChallenge',
	57	+
	58	+ // ICrypto
	59	+ 'calculateHMAC',
	60	+ 'encrypt',
	61	+ 'decrypt',
	62	+
	63	+ // LoginController
	64	+ 'tryLogin',
	65	+ 'confirmPassword',
	66	+
	67	+ // LDAP
	68	+ 'bind',
	69	+ 'areCredentialsValid',
	70	+ 'invokeLDAPMethod',
	71	+
	72	+ // Encryption
	73	+ 'storeKeyPair',
	74	+ 'setupUser',
	75	+
	76	+ // files_external: OC_Mount_Config
	77	+ 'getBackendStatus',
	78	+
	79	+ // files_external: UserStoragesController
	80	+ 'update',
	81	+ ];
	82	+
	83	+ const methodsWithSensitiveParametersByClass = [
	84	+ SetupController::class => [
	85	+ 'run',
	86	+ 'display',
	87	+ 'loadAutoConfig',
	88	+ ],
	89	+ Setup::class => [
	90	+ 'install'
	91	+ ]
	92	+ ];
	93	+
	94	+ private function editTrace(array &$sensitiveValues, array $traceLine): array {
	95	+ $sensitiveValues = array_merge($sensitiveValues, $traceLine['args']);
	96	+ $traceLine['args'] = ['* sensitive parameters replaced *'];
	97	+ return $traceLine;
	98	+ }
	99	+
	100	+ private function filterTrace(array $trace) {
	101	+ $sensitiveValues = [];
	102	+ $trace = array_map(function (array $traceLine) use (&$sensitiveValues) {
	103	+ $className = $traceLine['class'] ?? '';
	104	+ if ($className && isset(self::methodsWithSensitiveParametersByClass[$className])
	105	+ && in_array($traceLine['function'], self::methodsWithSensitiveParametersByClass[$className], true)) {
	106	+ return $this->editTrace($sensitiveValues, $traceLine);
	107	+ }
	108	+ foreach (self::methodsWithSensitiveParameters as $sensitiveMethod) {
	109	+ if (strpos($traceLine['function'], $sensitiveMethod) !== false) {
	110	+ return $this->editTrace($sensitiveValues, $traceLine);
	111	+ }
	112	+ }
	113	+ return $traceLine;
	114	+ }, $trace);
	115	+ return array_map(function (array $traceLine) use ($sensitiveValues) {
	116	+ if (isset($traceLine['args'])) {
	117	+ $traceLine['args'] = $this->removeValuesFromArgs($traceLine['args'], $sensitiveValues);
	118	+ }
	119	+ return $traceLine;
	120	+ }, $trace);
	121	+ }
	122	+
	123	+ private function removeValuesFromArgs($args, $values) {
	124	+ foreach ($args as &$arg) {
	125	+ if (in_array($arg, $values, true)) {
	126	+ $arg = '* sensitive parameter replaced *';
	127	+ } else if (is_array($arg)) {
	128	+ $arg = $this->removeValuesFromArgs($arg, $values);
	129	+ }
	130	+ }
	131	+ return $args;
	132	+ }
	133	+
	134	+ private function encodeTrace($trace) {
	135	+ $filteredTrace = $this->filterTrace($trace);
	136	+ return array_map(function (array $line) {
	137	+ if (isset($line['args'])) {
	138	+ $line['args'] = array_map([$this, 'encodeArg'], $line['args']);
	139	+ }
	140	+ return $line;
	141	+ }, $filteredTrace);
	142	+ }
	143	+
	144	+ private function encodeArg($arg) {
	145	+ if (is_object($arg)) {
	146	+ $data = get_object_vars($arg);
	147	+ $data['__class__'] = get_class($arg);
	148	+ return array_map([$this, 'encodeArg'], $data);
	149	+ } else if (is_array($arg)) {
	150	+ return array_map([$this, 'encodeArg'], $arg);
	151	+ } else {
	152	+ return $arg;
	153	+ }
	154	+ }
	155	+
	156	+ public function serializeException(\Throwable $exception) {
	157	+ $data = [
	158	+ 'Exception' => get_class($exception),
	159	+ 'Message' => $exception->getMessage(),
	160	+ 'Code' => $exception->getCode(),
	161	+ 'Trace' => $this->encodeTrace($exception->getTrace()),
	162	+ 'File' => $exception->getFile(),
	163	+ 'Line' => $exception->getLine(),
	164	+ ];
	165	+
	166	+ if ($exception instanceof HintException) {
	167	+ $data['Hint'] = $exception->getHint();
	168	+ }
	169	+
	170	+ if ($exception->getPrevious()) {
	171	+ $data['Previous'] = $this->serializeException($exception->getPrevious());
	172	+ }
	173	+
	174	+ return $data;
	175	+ }
176	176	}

nextcloud / server

Push — master ( ddff72...a2ad5d )

Status

Category

Indentation +147 added lines, -147 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch