grommunio / grommunio-web

plugins/smime/php/lib/X509.php

Switch Indentation +25 added lines, -25 removed lines

@@ -15,31 +15,31 @@
 		$tag = $this->peek();
 
 		switch ($tag) {
-		case 0:
-			$res['otherName'] = $this->oid(-6);
-			break;
-
-		case 1:
-			$res['rfc822Name'] = $this->next(-22);
-			break;
-
-		case 2:
-			$res['dNSName'] = $this->next(-22);
-			break;
-
-		case 4:
-			$this->next(4);
-			$res['directoryName'] = $this->name();
-			$res['directoryName_'] = $this->nameasstring($res['directoryName']);
-			break;
-
-		case 6:
-			$res['uniformResourceIdentifier'] = $this->next(-22);
-			break;
-
-		default:
-			throw new \Exception("Unsupported GeneralName: {$tag}");
-#                trigger_error("Unsupported GeneralName: $tag", E_USER_ERROR);
+			case 0:
+				$res['otherName'] = $this->oid(-6);
+				break;
+
+			case 1:
+				$res['rfc822Name'] = $this->next(-22);
+				break;
+
+			case 2:
+				$res['dNSName'] = $this->next(-22);
+				break;
+
+			case 4:
+				$this->next(4);
+				$res['directoryName'] = $this->name();
+				$res['directoryName_'] = $this->nameasstring($res['directoryName']);
+				break;
+
+			case 6:
+				$res['uniformResourceIdentifier'] = $this->next(-22);
+				break;
+
+			default:
+				throw new \Exception("Unsupported GeneralName: {$tag}");
+	#                trigger_error("Unsupported GeneralName: $tag", E_USER_ERROR);
 		}
 
 		return $res;

plugins/smime/php/class.pluginsmimemodule.php

Switch Indentation +50 added lines, -50 removed lines

@@ -29,62 +29,62 @@
 			if (!isset($actionType))
 				continue;
 			switch ($actionType) {
-			case 'certificate':
-				$data = $this->verifyCertificate($actionData);
-				$response = [
-					'type' => 3,
-					'status' => $data['status'],
-					'message' => $data['message'],
-					'data' => $data['data'],
-				];
-				$this->addActionData('certificate', $response);
-				$GLOBALS['bus']->addData($this->getResponseData());
-				break;
+				case 'certificate':
+					$data = $this->verifyCertificate($actionData);
+					$response = [
+						'type' => 3,
+						'status' => $data['status'],
+						'message' => $data['message'],
+						'data' => $data['data'],
+					];
+					$this->addActionData('certificate', $response);
+					$GLOBALS['bus']->addData($this->getResponseData());
+					break;
 
-			case 'passphrase':
-				$data = $this->verifyPassphrase($actionData);
-				$response = [
-					'type' => 3,
-					'status' => $data['status'],
-				];
-				$this->addActionData('passphrase', $response);
-				$GLOBALS['bus']->addData($this->getResponseData());
-				break;
+				case 'passphrase':
+					$data = $this->verifyPassphrase($actionData);
+					$response = [
+						'type' => 3,
+						'status' => $data['status'],
+					];
+					$this->addActionData('passphrase', $response);
+					$GLOBALS['bus']->addData($this->getResponseData());
+					break;
 
-			case 'changepassphrase':
-				$data = $this->changePassphrase($actionData);
-				if ($data === CHANGE_PASSPHRASE_SUCCESS) {
-					// Reset cached passphrase.
-					$encryptionStore = EncryptionStore::getInstance();
-					withPHPSession(function () use ($encryptionStore) {
-						$encryptionStore->add('smime', '');
-					});
-				}
-				$response = [
-					'type' => 3,
-					'code' => $data,
-				];
-				$this->addActionData('changepassphrase', $response);
-				$GLOBALS['bus']->addData($this->getResponseData());
-				break;
+				case 'changepassphrase':
+					$data = $this->changePassphrase($actionData);
+					if ($data === CHANGE_PASSPHRASE_SUCCESS) {
+						// Reset cached passphrase.
+						$encryptionStore = EncryptionStore::getInstance();
+						withPHPSession(function () use ($encryptionStore) {
+							$encryptionStore->add('smime', '');
+						});
+					}
+					$response = [
+						'type' => 3,
+						'code' => $data,
+					];
+					$this->addActionData('changepassphrase', $response);
+					$GLOBALS['bus']->addData($this->getResponseData());
+					break;
 
-			case 'list':
-				$data = $this->getPublicCertificates();
-				$this->addActionData('list', $data);
-				$GLOBALS['bus']->addData($this->getResponseData());
-				break;
+				case 'list':
+					$data = $this->getPublicCertificates();
+					$this->addActionData('list', $data);
+					$GLOBALS['bus']->addData($this->getResponseData());
+					break;
 
-			case 'delete':
-				// FIXME: handle multiple deletes? Separate function?
-				$entryid = $actionData['entryid'];
-				$root = mapi_msgstore_openentry($this->store, null);
-				mapi_folder_deletemessages($root, [hex2bin($entryid)]);
+				case 'delete':
+					// FIXME: handle multiple deletes? Separate function?
+					$entryid = $actionData['entryid'];
+					$root = mapi_msgstore_openentry($this->store, null);
+					mapi_folder_deletemessages($root, [hex2bin($entryid)]);
 
-				$this->sendFeedback(true);
-				break;
+					$this->sendFeedback(true);
+					break;
 
-			default:
-				$this->handleUnknownActionType($actionType);
+				default:
+					$this->handleUnknownActionType($actionType);
 			}
 		}
 		catch (Exception $e) {

Spacing +2 added lines, -2 removed lines

@@ -56,7 +56,7 @@ 
 				if ($data === CHANGE_PASSPHRASE_SUCCESS) {
 					// Reset cached passphrase.
 					$encryptionStore = EncryptionStore::getInstance();
-					withPHPSession(function () use ($encryptionStore) {
+					withPHPSession(function() use ($encryptionStore) {
 						$encryptionStore->add('smime', '');
 					});
 				}
@@ -167,7 +167,7 @@ 
 				$encryptionStore->add('smime', $data['passphrase'], time() + (5 * 60));
 			}
 			else {
-				withPHPSession(function () use ($encryptionStore, $data) {
+				withPHPSession(function() use ($encryptionStore, $data) {
 					$encryptionStore->add('smime', $data['passphrase']);
 				});
 			}

Braces +3 added lines, -1 removed lines

@@ -25,9 +25,11 @@
 	 * @return bool true on success or false on failure
 	 */
 	public function execute() {
-		foreach ($this->data as $actionType => $actionData) try {
+		foreach ($this->data as $actionType => $actionData) {
+			try {
 			if (!isset($actionType))
 				continue;
+		}
 			switch ($actionType) {
 			case 'certificate':
 				$data = $this->verifyCertificate($actionData);

plugins/smime/php/plugin.smime.php

Indentation +8 added lines, -8 removed lines

@@ -163,9 +163,9 @@ 
 		$messageClass = mapi_getprops($message, [PR_MESSAGE_CLASS]);
 		$messageClass = $messageClass[PR_MESSAGE_CLASS];
 		if ($messageClass !== 'IPM.Note.SMIME' &&
-		    $messageClass !== 'IPM.Note.SMIME.SignedEncrypt' &&
-		    $messageClass !== 'IPM.Note.deferSMIME' &&
-		    $messageClass !== 'IPM.Note.deferSMIME.SignedEncrypt')
+			$messageClass !== 'IPM.Note.SMIME.SignedEncrypt' &&
+			$messageClass !== 'IPM.Note.deferSMIME' &&
+			$messageClass !== 'IPM.Note.deferSMIME.SignedEncrypt')
 			return;
 
 		$recipients = $data['action']['props']['smime'];
@@ -607,17 +607,17 @@ 
 		if (!isset($messageClass))
 			return;
 		if (stripos($messageClass, 'IPM.Note.deferSMIME') === false &&
-		    stripos($messageClass, 'IPM.Note.SMIME') === false)
+			stripos($messageClass, 'IPM.Note.SMIME') === false)
 			return;
 
 		// FIXME: for now return when we are going to sign but we don't have the passphrase set
 		// This should never happen sign
 		$encryptionStore = \EncryptionStore::getInstance();
 		if (($messageClass === 'IPM.Note.deferSMIME.SignedEncrypt' ||
-		    $messageClass === 'IPM.Note.deferSMIME.MultipartSigned' ||
-		    $messageClass === 'IPM.Note.SMIME.SignedEncrypt' ||
-		    $messageClass === 'IPM.Note.SMIME.MultipartSigned') &&
-		    !$encryptionStore->get('smime'))
+			$messageClass === 'IPM.Note.deferSMIME.MultipartSigned' ||
+			$messageClass === 'IPM.Note.SMIME.SignedEncrypt' ||
+			$messageClass === 'IPM.Note.SMIME.MultipartSigned') &&
+			!$encryptionStore->get('smime'))
 			return;
 		// NOTE: setting message class to IPM.Note, so that mapi_inetmapi_imtoinet converts the message to plain email
 		// and doesn't fail when handling the attachments.

Switch Indentation +56 added lines, -56 removed lines

@@ -92,45 +92,45 @@ 
 	public function execute($eventID, &$data) {
 		switch ($eventID) {
 		// Register plugin
-		case 'server.core.settings.init.before':
-			$this->onBeforeSettingsInit($data);
-			break;
-		// Verify a signed or encrypted message when an email is opened
-		case 'server.util.parse_smime.signed':
-			$this->onSignedMessage($data);
-			break;
-
-		case 'server.util.parse_smime.encrypted':
-			$this->onEncrypted($data);
-			break;
-		// Add S/MIME property, which is send to the client
-		case 'server.module.itemmodule.open.after':
-			$this->onAfterOpen($data);
-			break;
-		// Catch uploaded certificate
-		case 'server.upload_attachment.upload':
-			$this->onUploadCertificate($data);
-			break;
-		// Sign email before sending
-		case 'server.core.operations.submitmessage':
-			$this->onBeforeSend($data);
-			break;
-		// Verify that we have public certificates for all recipients
-		case 'server.module.createmailitemmodule.beforesend':
-			$this->onCertificateCheck($data);
-			break;
-
-		case 'server.index.load.custom':
-			if ($data['name'] === 'smime_passphrase') {
-				include 'templates/passphrase.tpl.php';
-				exit();
-			}
-			if ($data['name'] === 'smime_passphrasecheck') {
-				// No need to do anything, this is just used to trigger
-				// the browser's autofill save password dialog.
-				exit();
-			}
-			break;
+			case 'server.core.settings.init.before':
+				$this->onBeforeSettingsInit($data);
+				break;
+			// Verify a signed or encrypted message when an email is opened
+			case 'server.util.parse_smime.signed':
+				$this->onSignedMessage($data);
+				break;
+
+			case 'server.util.parse_smime.encrypted':
+				$this->onEncrypted($data);
+				break;
+			// Add S/MIME property, which is send to the client
+			case 'server.module.itemmodule.open.after':
+				$this->onAfterOpen($data);
+				break;
+			// Catch uploaded certificate
+			case 'server.upload_attachment.upload':
+				$this->onUploadCertificate($data);
+				break;
+			// Sign email before sending
+			case 'server.core.operations.submitmessage':
+				$this->onBeforeSend($data);
+				break;
+			// Verify that we have public certificates for all recipients
+			case 'server.module.createmailitemmodule.beforesend':
+				$this->onCertificateCheck($data);
+				break;
+
+			case 'server.index.load.custom':
+				if ($data['name'] === 'smime_passphrase') {
+					include 'templates/passphrase.tpl.php';
+					exit();
+				}
+				if ($data['name'] === 'smime_passphrasecheck') {
+					// No need to do anything, this is just used to trigger
+					// the browser's autofill save password dialog.
+					exit();
+				}
+				break;
 		}
 	}
 
@@ -663,23 +663,23 @@ 
 
 		// Sign then Encrypt email
 		switch ($messageClass) {
-		case 'IPM.Note.deferSMIME.SignedEncrypt':
-		case 'IPM.Note.SMIME.SignedEncrypt':
-			$tmpFile = tempnam(sys_get_temp_dir(), true);
-			$this->sign($tmpSendEmail, $tmpFile, $message, $signedAttach, $smimeProps);
-			$this->encrypt($tmpFile, $tmpSendSmimeEmail, $message, $signedAttach, $smimeProps);
-			unlink($tmpFile);
-			break;
-
-		case 'IPM.Note.deferSMIME.MultipartSigned':
-		case 'IPM.Note.SMIME.MultipartSigned':
-			$this->sign($tmpSendEmail, $tmpSendSmimeEmail, $message, $signedAttach, $smimeProps);
-			break;
-
-		case 'IPM.Note.deferSMIME':
-		case 'IPM.Note.SMIME':
-			$this->encrypt($tmpSendEmail, $tmpSendSmimeEmail, $message, $signedAttach, $smimeProps);
-			break;
+			case 'IPM.Note.deferSMIME.SignedEncrypt':
+			case 'IPM.Note.SMIME.SignedEncrypt':
+				$tmpFile = tempnam(sys_get_temp_dir(), true);
+				$this->sign($tmpSendEmail, $tmpFile, $message, $signedAttach, $smimeProps);
+				$this->encrypt($tmpFile, $tmpSendSmimeEmail, $message, $signedAttach, $smimeProps);
+				unlink($tmpFile);
+				break;
+
+			case 'IPM.Note.deferSMIME.MultipartSigned':
+			case 'IPM.Note.SMIME.MultipartSigned':
+				$this->sign($tmpSendEmail, $tmpSendSmimeEmail, $message, $signedAttach, $smimeProps);
+				break;
+
+			case 'IPM.Note.deferSMIME':
+			case 'IPM.Note.SMIME':
+				$this->encrypt($tmpSendEmail, $tmpSendSmimeEmail, $message, $signedAttach, $smimeProps);
+				break;
 		}
 
 		// Save the signed message as attachment of the send email

Braces +27 added lines, -18 removed lines

@@ -165,8 +165,9 @@ 
 		if ($messageClass !== 'IPM.Note.SMIME' &&
 		    $messageClass !== 'IPM.Note.SMIME.SignedEncrypt' &&
 		    $messageClass !== 'IPM.Note.deferSMIME' &&
-		    $messageClass !== 'IPM.Note.deferSMIME.SignedEncrypt')
-			return;
+		    $messageClass !== 'IPM.Note.deferSMIME.SignedEncrypt') {
+					return;
+		}
 
 		$recipients = $data['action']['props']['smime'];
 		$missingCerts = [];
@@ -300,8 +301,9 @@ 
 				$importCert = file_get_contents($outcert);
 				$parsedImportCert = openssl_x509_parse($importCert);
 				$parsedUserCert = openssl_x509_parse($userCert);
-				if (!$signed_ok || $openssl_error_code === OPENSSL_CA_VERIFY_FAIL)
-					continue;
+				if (!$signed_ok || $openssl_error_code === OPENSSL_CA_VERIFY_FAIL) {
+									continue;
+				}
 
 				// CA Checks out
 				$caCerts = $this->extractCAs($tmpfname);
@@ -528,8 +530,9 @@ 
 	 * @param {mixed} $data
 	 */
 	public function onUploadCertificate($data) {
-		if ($data['sourcetype'] !== 'certificate')
-			return;
+		if ($data['sourcetype'] !== 'certificate') {
+					return;
+		}
 		$passphrase = $_POST['passphrase'];
 		$saveCert = false;
 		$tmpname = $data['tmpname'];
@@ -604,11 +607,13 @@ 
 		$props = mapi_getprops($message, [PR_MESSAGE_CLASS]);
 		$messageClass = $props[PR_MESSAGE_CLASS];
 
-		if (!isset($messageClass))
-			return;
+		if (!isset($messageClass)) {
+					return;
+		}
 		if (stripos($messageClass, 'IPM.Note.deferSMIME') === false &&
-		    stripos($messageClass, 'IPM.Note.SMIME') === false)
-			return;
+		    stripos($messageClass, 'IPM.Note.SMIME') === false) {
+					return;
+		}
 
 		// FIXME: for now return when we are going to sign but we don't have the passphrase set
 		// This should never happen sign
@@ -617,8 +622,9 @@ 
 		    $messageClass === 'IPM.Note.deferSMIME.MultipartSigned' ||
 		    $messageClass === 'IPM.Note.SMIME.SignedEncrypt' ||
 		    $messageClass === 'IPM.Note.SMIME.MultipartSigned') &&
-		    !$encryptionStore->get('smime'))
-			return;
+		    !$encryptionStore->get('smime')) {
+					return;
+		}
 		// NOTE: setting message class to IPM.Note, so that mapi_inetmapi_imtoinet converts the message to plain email
 		// and doesn't fail when handling the attachments.
 		mapi_setprops($message, [PR_MESSAGE_CLASS => 'IPM.Note']);
@@ -862,8 +868,9 @@ 
 			foreach ($certs as $cert) {
 				$pubkey = mapi_msgstore_openentry($this->getStore(), $cert[PR_ENTRYID]);
 				$certificate = "";
-				if ($pubkey == false)
-					continue;
+				if ($pubkey == false) {
+									continue;
+				}
 				// retrieve pkcs#11 certificate from body
 				$stream = mapi_openproperty($pubkey, PR_BODY, IID_IStream, 0, 0);
 				$stat = mapi_stream_stat($stream);
@@ -985,8 +992,9 @@ 
 	 */
 	public function importCertificate($cert, $certData, $type = 'public', $force = false) {
 		$certEmail = getCertEmail($certData);
-		if ($this->pubcertExists($certEmail) && !$force && $type !== 'private')
-			return;
+		if ($this->pubcertExists($certEmail) && !$force && $type !== 'private') {
+					return;
+		}
 		$issued_by = "";
 		foreach (array_keys($certData['issuer']) as $key) {
 			$issued_by .= $key . '=' . $certData['issuer'][$key] . "\n";
@@ -1110,8 +1118,9 @@ 
 	 * @return array with properties
 	 */
 	public function getSenderAddress($mapiMessage) {
-		if (method_exists($GLOBALS['operations'], 'getSenderAddress'))
-			return $GLOBALS["operations"]->getSenderAddress($mapiMessage);
+		if (method_exists($GLOBALS['operations'], 'getSenderAddress')) {
+					return $GLOBALS["operations"]->getSenderAddress($mapiMessage);
+		}
 
 		$messageProps = mapi_getprops($mapiMessage, [PR_SENT_REPRESENTING_ENTRYID, PR_SENDER_ENTRYID]);
 		$senderEntryID = isset($messageProps[PR_SENT_REPRESENTING_ENTRYID]) ? $messageProps[PR_SENT_REPRESENTING_ENTRYID] : $messageProps[PR_SENDER_ENTRYID];

plugins/smime/php/class.certificate.php

Switch Indentation +6 added lines, -6 removed lines

@@ -33,14 +33,14 @@
 		}
 
 		switch ($this->status) {
-		case 'good':
-			return OCSP_CERT_STATUS_GOOD;
+			case 'good':
+				return OCSP_CERT_STATUS_GOOD;
 
-		case 'revoked':
-			return OCSP_CERT_STATUS_REVOKED;
+			case 'revoked':
+				return OCSP_CERT_STATUS_REVOKED;
 
-		default:
-			return OCSP_CERT_STATUS_UNKOWN;
+			default:
+				return OCSP_CERT_STATUS_UNKOWN;
 		}
 	}
 }

plugins/smime/php/util.php

Braces +3 added lines, -2 removed lines

@@ -98,8 +98,9 @@
 	// Get messages from certificates
 	foreach ($privateCerts as $privateCert) {
 		$privateCertMessage = mapi_msgstore_openentry($store, $privateCert[PR_ENTRYID]);
-		if ($privateCertMessage === false)
-			continue;
+		if ($privateCertMessage === false) {
+					continue;
+		}
 		$pkcs12 = "";
 		$certs = [];
 		// Read pkcs12 cert from message