run some autoformat

- add stripLocalpart in helpers.php
- extend mxDatabase to update the password once validated

MatrixConnection.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright 2018 Matthias Kesler
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,8 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-class MatrixConnection
+class MatrixConnection {
-{
+
     private $hs;
     private $at;
 
@@ -33,7 +34,7 @@ class MatrixConnection
         if (!$message) {
             error_log("no message to send");
             return false;
-		} elseif(is_array($message)) {
+        } elseif (is_array($message)) {
             $send_message = $message;
         } elseif ($message instanceof MatrixMessage) {
             $send_message = $message->get_object();
@@ -42,8 +43,8 @@ class MatrixConnection
             return false;
         }
 
-		$url="https://".$this->hs."/_matrix/client/r0/rooms/"
+        $url = "https://" . $this->hs . "/_matrix/client/r0/rooms/"
-			. urlencode($room_id) ."/send/m.room.message?access_token=".$this->at;
+                . urlencode($room_id) . "/send/m.room.message?access_token=" . $this->at;
         $handle = curl_init($url);
         curl_setopt($handle, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($handle, CURLOPT_CONNECTTIMEOUT, 5);
@@ -65,10 +66,10 @@ class MatrixConnection
 
     function hasUser($username) {
         if (!$username) {
-			throw new Exception ("no user given to lookup");
+            throw new Exception("no user given to lookup");
         }
 
-		$url = "https://".$this->hs."/_matrix/client/r0/profile/@" . $username . ":" . $this->hs;
+        $url = "https://" . $this->hs . "/_matrix/client/r0/profile/@" . $username . ":" . $this->hs;
         $handle = curl_init($url);
         curl_setopt($handle, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($handle, CURLOPT_CONNECTTIMEOUT, 5);
@@ -94,7 +95,7 @@ class MatrixConnection
             "password" => $password,
             "mac" => $mac,
         );
-		$url = "https://".$this->hs."/_matrix/client/v2_alpha/register";
+        $url = "https://" . $this->hs . "/_matrix/client/v2_alpha/register";
         $handle = curl_init($url);
         curl_setopt($handle, CURLOPT_RETURNTRANSFER, true);
         curl_setopt($handle, CURLOPT_CONNECTTIMEOUT, 5);
@@ -107,7 +108,6 @@ class MatrixConnection
 
     function exec_curl_request($handle) {
         $response = curl_exec($handle);
-
         if ($response === false) {
             $errno = curl_errno($handle);
             $error = curl_error($handle);
@@ -115,7 +115,6 @@ class MatrixConnection
             curl_close($handle);
             return false;
         }
-
         $http_code = intval(curl_getinfo($handle, CURLINFO_HTTP_CODE));
         curl_close($handle);
 
@@ -132,13 +131,13 @@ class MatrixConnection
         } else {
             $response = json_decode($response, true);
         }
-
         return $response;
     }
+
 }
 
-class MatrixMessage
+class MatrixMessage {
-{
+
     private $message;
 
     function __construct() {
@@ -157,7 +156,7 @@ class MatrixMessage
         $this->message["body"] = $body;
     }
 
-	function set_formatted_body($fbody, $format="org.matrix.custom.html") {
+    function set_formatted_body($fbody, $format = "org.matrix.custom.html") {
         $this->message["formatted_body"] = $fbody;
         $this->message["format"] = $format;
     }
@@ -165,5 +164,7 @@ class MatrixMessage
     function get_object() {
         return $this->message;
     }
+
 }
+
 ?>

README.md

@@ -14,17 +14,34 @@ This is done in several steps:
 
 2nd step: Implement the other apis to integrade [mxisd](https://github.com/kamax-io/mxisd/blob/master/docs/backends/rest.md)
 
+This bot takes care for user accounts. So it stores the credentials itself and provides ways to access them via matrix-synapse-rest-auth or mxisd.
 ## How to install
 
 - Copy `config.sample.php` to `config.php` and configure the bot as you can find there
-- Configure your webserver to publish the folder `public` and configure.
+- Configure your webserver to publish the folder `public`.
-  The folder `internal` contains files that can be accessed by mxisd or matrix-synapse-rest-auth
+  The folder `internal` contains files that can be accessed by mxisd or matrix-synapse-rest-auth or else via a reverse proxy
-- To integrate with matrix-synapse-rest-auth:
+- To integrate with [matrix-synapse-rest-auth](https://github.com/kamax-io/matrix-synapse-rest-auth):
   - `/_matrix-internal/identity/v1/check_credentials` should map to `internal/login.php`
-- To integrate with mxisd: Have a look at [the docs](https://github.com/kamax-io/mxisd/blob/master/docs/backends/rest.md) and apply as follows:
+- To integrate with [mxisd](https://github.com/kamax-io/mxisd): Have a look at [the docs](https://github.com/kamax-io/mxisd/blob/master/docs/backends/rest.md) and apply as follows:
+
+
 | Key                            | file which handles that       | Description                                          |
 |--------------------------------|-------------------------------|------------------------------------------------------|
 | rest.endpoints.auth            | internal/login.php            | Validate credentials and get user profile            |
 | rest.endpoints.directory       | internal/directory_search.php | Search for users by arbitrary input                  |
 | rest.endpoints.identity.single | internal/identity_single.php  | Endpoint to query a single 3PID                      |
 | rest.endpoints.identity.bulk   | internal/identity_bulk.php    | Endpoint to query a list of 3PID                     |
+
+
+## Implement usage of additional features:
+### Use the ChangePasswortInterceptor:
+
+You need a reverse proxy which maps `/_matrix/client/r0/account/password` to `internal/intercept_change_password.php`.
+Here is an example for nginx:
+
+```
+        location /_matrix/client/r0/account/password {
+                proxy_pass http://localhost/mxbot/internal/intercept_change_password.php;
+                proxy_set_header X-Forwarded-For $remote_addr;
+        }
+```

config.sample.php

@@ -1,26 +1,22 @@
 <?php
+
 $config = [
     "homeserver" => "example.com",
     "access_token" => "To be used for sending the registration notification",
-
     // Which e-mail-adresse shall the bot use to send e-mails?
     "register_email" => 'register_bot@example.com',
     // Where should the bot post registration requests to?
     "register_room" => '$registerRoomID:example.com',
-
     // Where is the public part of the bot located? make sure you have a / at the end
     "webroot" => "https://myregisterdomain.net/",
-
     // optional: Do you have a place where howTo's are located? If not leave this value out
     "howToURL" => "https://my-url-for-storing-howTos.net",
-
     // When you want to collect the password on registration set this to true
     "getPasswordOnRegistration" => false,
-
     // to define where the data should be stored:
     "databaseURI" => "sqlite:" . dirname(__FILE__) . "/db_file.sqlite",
     // credentials for sqlite not used
     "databaseUser" => "dbUser123",
     "databasePass" => "secretPassword",
-]
+        ]
 ?>

cron.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright 2018 Matthias Kesler
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,12 +19,12 @@ require_once("mail_templates.php");
 require_once("database.php");
 
 $sql = "SELECT id, first_name, last_name, username, email, state, note, verify_token, admin_token FROM registrations "
-."WHERE state = ". RegisterState::PendingEmailSend
+        . "WHERE state = " . RegisterState::PendingEmailSend
-. " OR state = " . RegisterState::PendingAdminSend
+        . " OR state = " . RegisterState::PendingAdminSend
-. " OR state = " . RegisterState::PendingRegistration
+        . " OR state = " . RegisterState::PendingRegistration
-. " OR state = " . RegisterState::PendingSendRegistrationMail
+        . " OR state = " . RegisterState::PendingSendRegistrationMail
-. " OR state = " . RegisterState::RegistrationDeclined
+        . " OR state = " . RegisterState::RegistrationDeclined
-. " OR state = " . RegisterState::AllDone . ";";
+        . " OR state = " . RegisterState::AllDone . ";";
 foreach ($mx_db->query($sql) as $row) {
     $first_name = $row["first_name"];
     $last_name = $row["last_name"];
@@ -36,15 +37,12 @@ foreach ($mx_db->query($sql) as $row) {
             case RegisterState::PendingEmailSend:
                 $verify_url = $config["webroot"] . "/verify.php?t=" . $row["verify_token"];
                 $success = send_mail_pending_verification(
-						$config["homeserver"],
+                        $config["homeserver"], $row["first_name"] . " " . $row["last_name"], $row["email"], $verify_url);
-						$row["first_name"] . " " . $row["last_name"],
-						$row["email"],
-						$verify_url);
 
                 if ($success) {
                     $mx_db->setRegistrationStateById(RegisterState::PendingEmailVerify, $row["id"]);
                 } else {
-					throw new Exception("Could not send mail to ".$row["first_name"]." ".$row["last_name"]."(".$row["id"].")");
+                    throw new Exception("Could not send mail to " . $row["first_name"] . " " . $row["last_name"] . "(" . $row["id"] . ")");
                 }
                 break;
             case RegisterState::PendingAdminSend:
@@ -57,7 +55,7 @@ foreach ($mx_db->query($sql) as $row) {
                         . "Zum Bearbeiten hier klicken:\r\n" . $adminUrl);
                 $mxMsg->set_formatted_body($first_name . ' ' . $last_name . " möchte sich registrieren und hat folgende Notiz hinterlassen:<br />"
                         . $row["note"] . "<br />"
-						. "Zum Bearbeiten <a href=\"". $adminUrl . "\">hier</a> klicken");
+                        . "Zum Bearbeiten <a href=\"" . $adminUrl . "\">hier</a> klicken");
                 $mxMsg->set_type("m.text");
                 $response = $mxConn->send($config["register_room"], $mxMsg);
 
@@ -66,7 +64,7 @@ foreach ($mx_db->query($sql) as $row) {
 
                     send_mail_pending_approval($config["homeserver"], $first_name . " " . $last_name, $email);
                 } else {
-					throw new Exception("Could not send notification for ".$row["first_name"]." ".$row["last_name"]."(".$row["id"].") to admins.");
+                    throw new Exception("Could not send notification for " . $row["first_name"] . " " . $row["last_name"] . "(" . $row["id"] . ") to admins.");
                 }
                 break;
             case RegisterState::PendingRegistration:

database.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright 2018 Matthias Kesler
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,11 +16,11 @@
  */
 require_once("config.php");
 if (!isset($config["databaseURI"])) {
-	throw new Exception ("malformed configuration: databaseURI not defined");
+    throw new Exception("malformed configuration: databaseURI not defined");
 }
 
-abstract class RegisterState
+abstract class RegisterState {
-{
+
     // Sending an E-Mail failed in the first attempt. Will retry later
     const PendingEmailSend = 0;
     // User got a mail. We wait for it to verfiy
@@ -30,21 +31,19 @@ abstract class RegisterState
     const PendingAdminVerify = 6;
     // Registration failed on first attempt. Will retry
     const PendingRegistration = 7;
-
     // in this case we have to reset the password of the user (or should we store it for this case?)
     const PendingSendRegistrationMail = 8;
-
     // State to allow persisting in the database although an admin declined it.
     // Will be removed regularly
     const RegistrationAccepted = 7;
     const RegistrationDeclined = 13;
-
     // User got successfully registered. Will be cleaned up later
     const AllDone = 100;
+
 }
 
-class mxDatabase
+class mxDatabase {
-{
+
     private $db = NULL;
 
     /**
@@ -164,6 +163,7 @@ class mxDatabase
         }
         return false;
     }
+
     function userRegistered($username) {
         $sql = "SELECT COUNT(*) FROM logins WHERE localpart = '" . $username . "' LIMIT 1;";
         $res = $this->db->query($sql);
@@ -197,11 +197,11 @@ class mxDatabase
 
         $this->db->exec("INSERT INTO registrations
 			(first_name, last_name, username, note, email, verify_token, admin_token)
-			VALUES ('" . $first_name."','" . $last_name . "','" . $username . "','"	. $note . "','"
+			VALUES ('" . $first_name . "','" . $last_name . "','" . $username . "','" . $note . "','"
-			. $email."','"	.$verify_token."','"	.$admin_token."')");
+                . $email . "','" . $verify_token . "','" . $admin_token . "')");
 
         return [
-			"verify_token"=> $verify_token,
+            "verify_token" => $verify_token,
         ];
     }
 
@@ -215,7 +215,6 @@ class mxDatabase
         $sql = "SELECT COUNT(*) FROM registrations WHERE admin_token = '" . $admin_token . "'"
                 . " AND state = " . RegisterState::PendingAdminVerify . " LIMIT 1;";
         $res = $this->db->query($sql);
-		$first_name = NULL; $last_name = NULL; $username = NULL; $note = NULL; $email = NULL;
 
         if ($res->fetchColumn() > 0) {
             $sql = "SELECT first_name, last_name, username, note, email FROM registrations"
@@ -240,7 +239,6 @@ class mxDatabase
         $sql = "SELECT COUNT(*) FROM registrations WHERE verify_token = '" . $verify_token . "'"
                 . " AND state = " . RegisterState::PendingEmailVerify . " LIMIT 1;";
         $res = $this->db->query($sql);
-		$first_name = NULL; $last_name = NULL; $username = NULL; $note = NULL; $email = NULL;
 
         if ($res->fetchColumn() > 0) {
             $sql = "SELECT first_name, last_name, note, email, admin_token FROM registrations "
@@ -292,10 +290,10 @@ class mxDatabase
 
         // generate a password with 10 characters
         $password = bin2hex(openssl_random_pseudo_bytes(5));
-		$password_hash = password_hash($password, PASSWORD_BCRYPT, ["cost"=>12]);
+        $password_hash = password_hash($password, PASSWORD_BCRYPT, ["cost" => 12]);
 
         $sql = "INSERT INTO logins (first_name, last_name, localpart, password_hash, email) VALUES "
-			. "('" . $first_name."','" . $last_name . "','" . $username . "','"
+                . "('" . $first_name . "','" . $last_name . "','" . $username . "','"
                 . $password_hash . "','" . $email . "');";
 
         if ($this->db->exec($sql)) {
@@ -304,6 +302,24 @@ class mxDatabase
         return NULL;
     }
 
+    function updatePassword($localpart, $old_password, $new_password) {
+        $user = $this->getUserForLogin($localpart, $old_password);
+        if ($user == NULL) {
+            throw new Exception("user with that credentials not found");
+        }
+
+        // The credentials were fine. So now set the new password
+        $password_hash = password_hash($new_password, PASSWORD_BCRYPT, ["cost" => 12]);
+
+        $sql = "UPDATE logins SET password_hash = '" . $password_hash . "'"
+                . "WHERE localpart = '" . $localpart . "'";
+
+        if ($this->db->exec($sql)) {
+            return true;
+        }
+        return false;
+    }
+
     function searchUserByName($search_term) {
         $term = filter_var($search_term, FILTER_SANITIZE_STRING);
         $result = array();
@@ -343,6 +359,7 @@ class mxDatabase
         }
         return $result;
     }
+
 }
 
 if (!isset($mx_db)) {

helpers.php

@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * Copyright 2018 Matthias Kesler
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+function stripLocalpart($mxid) {
+    $localpart = NULL;
+    if (!empty($mxid)) {
+        // A mxid would start with an @ so we start at the 2. position
+        $sepPos = strpos($mxid, ':', 1);
+        if ($sepPos === false) {
+            // : not found. Assume mxid is localpart
+            // TODO: further checks
+            $localpart = $mxid;
+        } else {
+            $localpart = substr($mxid, 1, strpos($mxid, ':') - 1);
+        }
+    }
+    return $localpart;
+}
+
+?>

internal/directory_search.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright 2018 Matthias Kesler
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,7 +15,7 @@
  * limitations under the License.
  */
 require_once("../database.php");
-$response=[
+$response = [
     "limited" => false,
     "result" => [],
 ];
@@ -39,9 +40,8 @@ try {
             $response["result"] = $mx_db->searchUserByEmail($input["search_term"]);
             break;
         default:
-            throw new Exception("unknown type for \"by\" param");
+            throw new Exception('unknown type for "by" param');
     }
-    
 } catch (Exception $e) {
     error_log("failed with error: " . $e->getMessage());
     $response["error"] = $e->getMessage();

internal/identity_bulk.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright 2018 Matthias Kesler
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -37,7 +38,7 @@ try {
         if (!isset($lookup["address"])) {
             throw new Exception('"lookup.address" is not defined');
         }
-        $res2 = array();
+        $res2 = NULL;
         switch ($lookup["medium"]) {
             case "email":
                 $res2 = $mx_db->searchUserByEmail($lookup["address"]);
@@ -54,9 +55,11 @@ try {
                 }
                 break;
             case "msisdn":
+                // This is reserved for number lookups
+                throw new Exception("unimplemented lookup medium");
                 break;
             default:
-                throw new Exception("unknown type for \"by\" param");
+                throw new Exception("unknown lookup medium");
         }
     }
 } catch (Exception $e) {

internal/identity_single.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright 2018 Matthias Kesler
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -30,7 +31,7 @@ try {
     if (!isset($input["lookup"]["address"])) {
         throw new Exception('"lookup.address" is not defined');
     }
-    $res2 = array();
+    $res2 = NULL;
     switch ($input["lookup"]["medium"]) {
         case "email":
             $res2 = $mx_db->searchUserByEmail($input["lookup"]["address"]);
@@ -46,15 +47,19 @@ try {
                     ]
                 ];
             }
-            
+            break;
-
+        case "msisdn":
+            // This is reserved for number lookups
+            throw new Exception("unimplemented lookup medium");
             break;
         default:
-            throw new Exception("unknown type for \"by\" param");
+            throw new Exception("unknown lookup medium");
     }
 } catch (Exception $e) {
-    error_log("ídentity_bulk failed with error: " . $e->getMessage());
+    error_log("ídentity_single failed with error: " . $e->getMessage());
-    $response["error"] = $e->getMessage();
+    $response = [
+        "error" => $e->getMessage()
+    ];
 }
 print (json_encode($response, JSON_PRETTY_PRINT) . "\n");
 ?>

internal/intercept_change_password.php

@@ -0,0 +1,69 @@
+<?php
+
+/**
+ * Copyright 2018 Matthias Kesler
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+// URL for this: /_matrix/client/r0/account/password?access_token=$ACCESS_TOKEN
+
+header('Access-Control-Allow-Origin: *');
+header('Access-Control-Allow-Methods: POST, OPTIONS');
+header('Access-Control-Allow-Headers: Origin, X-Requested-With, Content-Type, Accept, Authorization');
+if ($_SERVER['REQUEST_METHOD'] === 'OPTIONS') {
+    print ("{}");
+    // return with success
+    exit();
+}
+$response = new stdClass;
+try {
+    $inputJSON = file_get_contents('php://input');
+    $input = json_decode($inputJSON, TRUE);
+    if (empty($input)) {
+        throw new Exception('no valid json as input present');
+    }
+    if (!isset($input["auth"])) {
+        throw new Exception('"auth" is not defined');
+    }
+    if (!isset($input["auth"]["user"]) || !isset($input["auth"]["password"])) {
+        throw new Exception('"auth.user" or "auth.password" is not defined');
+    }
+    if (!isset($input["auth"]["type"]) || $input["auth"]["type"] !== "m.login.password") {
+        throw new Exception('no or unknown auth.type');
+    }
+    if (!isset($input["new_password"])) {
+        throw new Exception('"new_password" is not defined');
+    }
+
+    require_once("../helpers.php");
+    $localpart = stripLocalpart($input["auth"]["user"]);
+
+    if (empty($localpart)) {
+        throw new Exception("localpart cannot be identified");
+    }
+
+    require_once("../database.php");
+    if (!$mx_db->updatePassword(
+                    $localpart, $input["auth"]["password"], $input["new_password"]
+            )) {
+        throw new Exception("invalid credentials or another error while updating");
+    }
+} catch (Exception $e) {
+    header("HTTP/1.0 500 Internal Error");
+    error_log("failed with error: " . $e->getMessage());
+    $response = [
+        "errorcode" => "M_UNKNOWN",
+        "error" => $e->getMessage(),
+    ];
+}
+print (json_encode($response, JSON_PRETTY_PRINT));
+?>

internal/login.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright 2018 Matthias Kesler
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,18 +21,21 @@ $response = [
 ];
 
 require_once("../database.php");
+
 abstract class LoginRequester {
+
     const UNDEFINED = 0;
     const MXISD = 1;
     const RestAuth = 2;
+
 }
+
 $loginRequester = LoginRequester::UNDEFINED;
 
 try {
     $inputJSON = file_get_contents('php://input');
     $input = json_decode($inputJSON, TRUE);
-    $mxid = NULL;
+    $mxid = $localpart = NULL;
-    $localpart = NULL;
     if (isset($input["user"])) {
         if (isset($input["user"]["localpart"])) {
             $localpart = $input["user"]["localpart"];
@@ -45,32 +49,27 @@ try {
             $mxid = $input["user"]["mxid"];
             $loginRequester = LoginRequester::MXISD;
         }
+    } else {
+        throw new Exception('"user" not in request body');
     }
 
     // prefer the localpart attribute of mxisd. But in case of matrix-synapse-rest-auth
     // we have to parse it on our own
-    if (empty($localpart) && !empty($mxid)) {
+    if (empty($localpart)) {
-        // A mxid would start with an @ so we start at the 2. position
+        require_once("../helpers.php");
-        $sepPos = strpos($mxid,':', 1);
+        $localpart = stripLocalpart($mxid);
-        if ($sepPos === false) {
-            // : not found. Assume mxid is localpart
-            // TODO: further checks
-            $localpart = $mxid;
-        } else {
-            $localpart = substr($mxid, 1, strpos($mxid,':') - 1 );
-        }
     }
 
     if (empty($localpart)) {
-        throw new Exception ("localpart cannot be identified");
+        throw new Exception("localpart cannot be identified");
     }
 
     $password = NULL;
-    if (isset($input["user"]) && isset($input["user"]["password"])) {
+    if (isset($input["user"]["password"])) {
         $password = $input["user"]["password"];
     }
     if (empty($password)) {
-        throw new Exception ("password is not present");
+        throw new Exception("password is not present");
     }
 
     $user = $mx_db->getUserForLogin($localpart, $password);
@@ -102,6 +101,7 @@ try {
             // only return that it was successful.
             // we do not know how the data shall be transmitted so we do nothing with it
             $response["auth"]["success"] = false;
+            $response["auth"]["error"] = "unidentified requester";
             break;
     }
 } catch (Exception $e) {

lang/lang.de-de.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright 2018 Matthias Kesler
  * Licensed under the Apache License, Version 2.0 (the "License");

language.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright 2018 Matthias Kesler
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,10 +15,10 @@
  * limitations under the License.
  */
 $lang = "de-de";
-if(isset($_GET['lang'])){
+if (isset($_GET['lang'])) {
     $lang = filter_var($_GET['lang'], FILTER_SANITIZE_STRING);
 }
-$lang_file = dirname(__FILE__) . "/lang/lang.".$lang.".php";
+$lang_file = dirname(__FILE__) . "/lang/lang." . $lang . ".php";
 if (!file_exists($lang_file)) {
     error_log("Translation for " . $lang . " not found. Fallback to 'de-de'");
     $lang = "de-de";

mail_templates.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright 2018 Matthias Kesler
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -39,7 +40,7 @@ Danach ist eine Re-Registrierung mit deinem gewünschten Nutzernamen für andere
 Vielen Dank für dein Verständnis.
 
 Das Administratoren-Team von " . $homeserver;
-	return send_mail($receiver, $subject, $body );
+    return send_mail($receiver, $subject, $body);
 }
 
 function send_mail_pending_approval($homeserver, $user, $receiver) {
@@ -53,7 +54,7 @@ Du bekommst eine weitere E-Mail, sobald deine Registrierung bestätigt oder able
 Vielen Dank für dein Verständnis.
 
 Das Administratoren-Team von " . $homeserver;
-	return send_mail($receiver, $subject, $body );
+    return send_mail($receiver, $subject, $body);
 }
 
 function send_mail_registration_allowed_but_failed($homeserver, $user, $receiver) {
@@ -68,7 +69,6 @@ Wir melden uns, wenn die Registrierung erfolgreich war.
 
 Das Administratoren-Team von " . $homeserver;
     return send_mail($receiver, $subject, $body);
-
 }
 
 function send_mail_registration_success($homeserver, $user, $receiver, $username, $password, $howToURL) {
@@ -81,28 +81,28 @@ Zum Anmelden kannst du folgende Zugangsdaten verwenden:
 Nutzername: $username
 Passwort: $password
 
-Hinweis: Aktuell ist es nicht möglich, das Passwort selbst zu ändern. Sobald die Funktionalität zur
+Hinweis: Das Passwort kannst du aktuell über die App selbst ändern. Auch wenn das Passwort nirgends
-Verfügung steht, gibt es aber einen Hinweis.
+im Klartext gespeichert wird, kann jemand Zugriff auf diese Mail erlangen und so den Zugriff bekommen.
 ";
-/*
+    /*
-Wichtig: Bitte ändere das Passwort direkt nach der Anmeldung.
+      Wichtig: Bitte ändere das Passwort direkt nach der Anmeldung.
-Es wird zwar von unserer Seite nicht gespeichert, doch fremde könnten Zugriff auf diese E-Mail
+      Es wird zwar von unserer Seite nicht gespeichert, doch fremde könnten Zugriff auf diese E-Mail
-erhalten und so deinen Account kompromittieren.
+      erhalten und so deinen Account kompromittieren.
      */
-if (!empty($howToURL)) {
+    if (!empty($howToURL)) {
         $body .= "
 Zu weiteren Hilfestellungen findest du hier eine Auflistung von verschiedenen
 Anleitungen zu verschiedenen Clients:
 $howToURL\n";
-}
+    }
     $body .= "
 Viel Spaß bei der Verwendung von $homeserver.
 Bei Fragen findest du nach der Anmeldung ein paar Räume in denen du sie stellen kannst.
 
 Das Administratoren-Team von " . $homeserver;
     return send_mail($receiver, $subject, $body);
-
 }
+
 function send_mail_registration_decline($homeserver, $user, $receiver, $reason) {
     $subject = "Registrierung auf $homeserver abgelehnt.";
     $body = "Guten Tag " . $user . ",
@@ -116,6 +116,7 @@ Deine Registrierungsanfrage wurde durch die Administratoren abgelehnt.\n";
     }
 
     $body .= "\nDas Administratoren-Team von " . $homeserver;
-	return send_mail($receiver, $subject, $body );
+    return send_mail($receiver, $subject, $body);
 }
+
 ?>

public/index.php

@@ -22,7 +22,7 @@ require_once "../config.php";
 
 // enforce admin via https
 if (!isset($_SERVER['HTTPS'])) {
-	header('Location: https://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'], true, 301);
+    header('Location: https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], true, 301);
     exit();
 }
 
@@ -53,10 +53,10 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
         if (!isset($_POST["email"]) || !filter_var($_POST["email"], FILTER_VALIDATE_EMAIL)) {
             throw new Exception("EMAIL_INVALID_FORMAT");
         }
-		if (isset($_POST["first_name"]) && ! preg_match("/[A-Z][a-z]+/", $_POST["first_name"])) {
+        if (isset($_POST["first_name"]) && !preg_match("/[A-Z][a-z]+/", $_POST["first_name"])) {
             throw new Exception("FIRSTNAME_INVALID_FORMAT");
         }
-		if (isset($_POST["last_name"]) && ! preg_match("/[A-Z][a-z]+/", $_POST["last_name"])) {
+        if (isset($_POST["last_name"]) && !preg_match("/[A-Z][a-z]+/", $_POST["last_name"])) {
             throw new Exception("SIRNAME_INVALID_FORMAT");
         }
 
@@ -74,21 +74,17 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
 
         if (!isset($res["verify_token"])) {
             error_log("sth. went wrong. registration did not throw but admin_token not set");
-			throw Exception ("Unknown Error");
+            throw Exception("Unknown Error");
         }
         $verify_token = $res["verify_token"];
 
         $verify_url = $config["webroot"] . "/verify.php?t=" . $verify_token;
         require_once "../mail_templates.php";
         $success = send_mail_pending_verification(
-			$config["homeserver"],
+                $config["homeserver"], $first_name . " " . $last_name, $email, $verify_url);
-			$first_name . " " . $last_name,
-			$email,
-			$verify_url);
 
         $mx_db->setRegistrationStateVerify(
-			($success ? RegisterState::PendingEmailVerify : RegisterState::PendingEmailSend),
+                ($success ? RegisterState::PendingEmailVerify : RegisterState::PendingEmailSend), $verify_token);
-			$verify_token);
 
         print("<title>Erfolgreich</title>");
         print("</head><body>");
@@ -108,26 +104,26 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
     }
 } else {
     $_SESSION["token"] = bin2hex(random_bytes(16));
-?>
+    ?>
     <title>Registriere dich für <?php echo $config["homeserver"]; ?></title>
     <link href="//netdna.bootstrapcdn.com/bootstrap/3.1.0/css/bootstrap.min.css" rel="stylesheet">
     <style>
-body{
+        body{
             background-color: #525252;
-}
+        }
-.centered-form{
+        .centered-form{
             margin-top: 60px;
-}
+        }
 
-.centered-form .panel{
+        .centered-form .panel{
             background: rgba(255, 255, 255, 0.8);
             box-shadow: rgba(0, 0, 0, 0.3) 20px 20px 20px;
-}
+        }
     </style>
     <script type="text/javascript" src="//code.jquery.com/jquery-1.11.1.min.js"></script>
     <script type="text/javascript" src="//netdna.bootstrapcdn.com/bootstrap/3.1.0/js/bootstrap.min.js"></script>
-	</head>
+</head>
-	<body>
+<body>
     <div class="container">
         <div class="row centered-form">
             <div class="col-xs-12 col-sm-8 col-md-4 col-sm-offset-2 col-md-offset-4">
@@ -164,7 +160,7 @@ body{
                                 <input type="text" name="username" id="username" class="form-control input-sm"
                                        placeholder="Nutzername (für den Login)" pattern="[a-z1-9]{3,20}" required>
                             </div>
-<?php if (isset($config["getPasswordOnRegistration"]) && $config["getPasswordOnRegistration"]) { ?>
+                            <?php if (isset($config["getPasswordOnRegistration"]) && $config["getPasswordOnRegistration"]) { ?>
                                 <div class="row">
                                     <div class="col-xs-6 col-sm-6 col-md-6">
                                         <div class="form-group">
@@ -177,7 +173,7 @@ body{
                                         </div>
                                     </div>
                                 </div>
-<?php } ?>
+                            <?php } ?>
                             <input type="hidden" name="token" id="token" value="<?php echo $_SESSION["token"]; ?>">
                             <input type="submit" value="Registrieren" class="btn btn-info btn-block">
 
@@ -195,21 +191,21 @@ body{
     </div>
     <script type="text/javascript">
         var first_name = document.getElementById("first_name");
-	first_name.oninvalid = function(event) {
+        first_name.oninvalid = function (event) {
             event.target.setCustomValidity("Vorname muss das Format <Großbuchstabe><Kleinbuchstaben> haben");
         }
-	first_name.onkeyup = function(event) {
+        first_name.onkeyup = function (event) {
             event.target.setCustomValidity("");
         }
         var last_name = document.getElementById("last_name");
-	last_name.oninvalid = function(event) {
+        last_name.oninvalid = function (event) {
             event.target.setCustomValidity("Nachname muss das Format <Großbuchstabe><Kleinbuchstaben> haben");
         }
-	last_name.onkeyup = function(event) {
+        last_name.onkeyup = function (event) {
             event.target.setCustomValidity("");
         }
         var user_name = document.getElementById("username");
-	user_name.oninvalid = function(event) {
+        user_name.oninvalid = function (event) {
             event.target.setCustomValidity("Nutzername darf zwischen 3 und 20 kleine Buchstaben und Zahlen enthalten");
         }
         user_name.onkeyup = function (event) {
@@ -218,8 +214,8 @@ body{
 <?php if (isset($config["getPasswordOnRegistration"]) && $config["getPasswordOnRegistration"]) { ?>
             var password = document.getElementById("password")
                     , confirm_password = document.getElementById("password_confirm");
-	function validatePassword(){
+            function validatePassword() {
-		if(password.value != confirm_password.value) {
+                if (password.value != confirm_password.value) {
                     confirm_password.setCustomValidity("Passwörter stimmen nicht überein");
                 } else {
                     confirm_password.setCustomValidity('');
@@ -228,7 +224,7 @@ body{
             password.onchange = validatePassword;
             confirm_password.onkeyup = validatePassword;
 <?php } ?>
-</script>
+    </script>
-		<?php } ?>
+<?php } ?>
     </body>
 </html>

public/verify.php

@@ -23,7 +23,7 @@ require_once "../mail_templates.php";
 
 // enforce admin via https
 if (!isset($_SERVER['HTTPS'])) {
-	header('Location: https://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'], true, 301);
+    header('Location: https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], true, 301);
     exit();
 }
 
@@ -59,7 +59,7 @@ try {
             . "Zum Bearbeiten hier klicken:\r\n" . $adminUrl);
     $mxMsg->set_formatted_body($first_name . ' ' . $last_name . " möchte sich registrieren und hat folgende Notiz hinterlassen:<br />"
             . $note . "<br />"
-		. "Zum Bearbeiten <a href=\"". $adminUrl . "\">hier</a> klicken");
+            . "Zum Bearbeiten <a href=\"" . $adminUrl . "\">hier</a> klicken");
     $mxMsg->set_type("m.text");
     $response = $mxConn->send($config["register_room"], $mxMsg);
 
@@ -67,8 +67,7 @@ try {
         $message = $language["SEND_MATRIX_FAIL"];
     }
     $mx_db->setRegistrationStateVerify(
-		($response ? RegisterState::PendingAdminVerify : RegisterState::PendingAdminSend),
+            ($response ? RegisterState::PendingAdminVerify : RegisterState::PendingAdminSend), $token);
-		$token);
 
     send_mail_pending_approval($config["homeserver"], $first_name . " " . $last_name, $email);
 

public/verify_admin.php

@@ -23,7 +23,7 @@ require_once "../mail_templates.php";
 
 // enforce admin via https
 if (!isset($_SERVER['HTTPS'])) {
-	header('Location: https://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'], true, 301);
+    header('Location: https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], true, 301);
     exit();
 }
 
@@ -114,7 +114,7 @@ try {
             }
 
             .centered-form .panel{
-background: rgba(255, 255, 255, 0.8);
+                background: rgba(255, 255, 255, 0.8);
                 box-shadow: rgba(0, 0, 0, 0.3) 20px 20px 20px;
             }
         </style>
@@ -127,7 +127,7 @@ background: rgba(255, 255, 255, 0.8);
                 <div class="col-xs-12 col-sm-8 col-md-4 col-sm-offset-2 col-md-offset-4">
                     <div class="panel panel-default">
                         <div class="panel-heading">
-			<h3 class="panel-title"><?php echo $language["ADMIN_VERIFY_SITE_TITLE"] ; ?></h3>
+                            <h3 class="panel-title"><?php echo $language["ADMIN_VERIFY_SITE_TITLE"]; ?></h3>
                         </div>
                         <div class="panel-body">
                             <form name="appForm" role="form" action="verify_admin.php" method="GET">
@@ -168,7 +168,7 @@ background: rgba(255, 255, 255, 0.8);
 
             <?php
         } // else - no action provided
-} catch (Exception $e) {
+    } catch (Exception $e) {
         print("<title>" . $language["REGISTRATION_FAILED"] . "</title>");
         print("</head><body>");
         print("<h1>" . $language["REGISTRATION_FAILED"] . "</h1>");
@@ -178,7 +178,7 @@ background: rgba(255, 255, 255, 0.8);
             print("<p>" . $e->getMessage() . "</p>");
         }
         print("<a href=\"" . $config["webroot"] . "/index.php" . "\">Zur Registrierungsseite</a>");
-}
+    }
-?>
+    ?>
-</body>
+                    < /body>
-</html>
+         </html>