From 7a160c1e3ec1e4bbd36438dbcc36f529d145a0d3 Mon Sep 17 00:00:00 2001 From: flashwave Date: Wed, 14 Mar 2018 02:39:02 +0100 Subject: [PATCH] You say 'a step backwards', I say 'modern web development'. --- composer.json | 1 - composer.lock | 46 +----- misuzu.php | 10 ++ .../AuthController.php => public/auth.php | 136 +++++++++--------- public/index.php | 22 +-- public/profile.php | 9 ++ src/Application.php | 14 -- src/Controllers/Controller.php | 6 - src/Controllers/HomeController.php | 16 --- src/Controllers/UserController.php | 16 --- utility.php | 22 +++ views/nova/auth/login.twig | 2 +- views/nova/auth/master.twig | 2 +- views/nova/home/landing.twig | 4 +- views/nova/master.twig | 6 +- 15 files changed, 114 insertions(+), 198 deletions(-) rename src/Controllers/AuthController.php => public/auth.php (50%) create mode 100644 public/profile.php delete mode 100644 src/Controllers/Controller.php delete mode 100644 src/Controllers/HomeController.php delete mode 100644 src/Controllers/UserController.php diff --git a/composer.json b/composer.json index dc6c5540..b6cac299 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,6 @@ "ext-bcmath": "*", "ext-mbstring": "*", "twig/twig": "~2.4", - "phroute/phroute": "~2.1", "nesbot/carbon": "~1.22", "illuminate/database": "~5.5", "illuminate/filesystem": "~5.5", diff --git a/composer.lock b/composer.lock index 7cc54190..43ec0abb 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "ad8d5aadca5a1f854d58dd82131f701a", + "content-hash": "bfc5b8cbdbf22514c4b51ae1af8c333b", "packages": [ { "name": "composer/ca-bundle", @@ -1148,50 +1148,6 @@ ], "time": "2018-03-10T10:10:14+00:00" }, - { - "name": "phroute/phroute", - "version": "v2.1.0", - "source": { - "type": "git", - "url": "https://github.com/mrjgreen/phroute.git", - "reference": "dbe2b986f9ee1dd33dc956fcc35d1fa22e8e196c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/mrjgreen/phroute/zipball/dbe2b986f9ee1dd33dc956fcc35d1fa22e8e196c", - "reference": "dbe2b986f9ee1dd33dc956fcc35d1fa22e8e196c", - "shasum": "" - }, - "require": { - "php": ">=5.4.0" - }, - "require-dev": { - "phpunit/phpunit": "*", - "satooshi/php-coveralls": "dev-master" - }, - "type": "library", - "autoload": { - "psr-4": { - "Phroute\\Phroute\\": "src/Phroute" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Joe Green", - "email": "joe.green.0991@gmail.com" - } - ], - "description": "Fast, fully featured restful request router for PHP", - "keywords": [ - "router", - "routing" - ], - "time": "2015-07-22T20:46:43+00:00" - }, { "name": "psr/container", "version": "1.0.0", diff --git a/misuzu.php b/misuzu.php index c999710b..61db05fa 100644 --- a/misuzu.php +++ b/misuzu.php @@ -8,3 +8,13 @@ $app = Application::start( IO\Directory::exists(__DIR__ . '/vendor/phpunit/phpunit') ); $app->startDatabase(); + +if (PHP_SAPI !== 'cli') { + if (isset($_COOKIE['msz_uid'], $_COOKIE['msz_sid'])) { + $app->startSession((int)$_COOKIE['msz_uid'], $_COOKIE['msz_sid']); + } + + //ob_start('ob_gzhandler'); + + $app->startTemplating(); +} diff --git a/src/Controllers/AuthController.php b/public/auth.php similarity index 50% rename from src/Controllers/AuthController.php rename to public/auth.php index b17f5e0b..d631c59f 100644 --- a/src/Controllers/AuthController.php +++ b/public/auth.php @@ -1,6 +1,4 @@ 'Your username may not start or end with spaces!', - 'short' => "Your username is too short, it has to be at least " . User::USERNAME_MIN_LENGTH . " characters!", - 'long' => "Your username is too long, it can't be longer than " . User::USERNAME_MAX_LENGTH . " characters!", - 'double-spaces' => "Your username can't contain double spaces.", - 'invalid' => 'Your username contains invalid characters.', - 'spacing' => 'Please use either underscores or spaces, not both!', - ]; +require_once __DIR__ . '/../misuzu.php'; - public function login() - { - $app = Application::getInstance(); +$username_validation_errors = [ + 'trim' => 'Your username may not start or end with spaces!', + 'short' => "Your username is too short, it has to be at least " . User::USERNAME_MIN_LENGTH . " characters!", + 'long' => "Your username is too long, it can't be longer than " . User::USERNAME_MAX_LENGTH . " characters!", + 'double-spaces' => "Your username can't contain double spaces.", + 'invalid' => 'Your username contains invalid characters.', + 'spacing' => 'Please use either underscores or spaces, not both!', +]; +$mode = $_GET['m'] ?? 'login'; +$app->templating->var('auth_mode', $mode); + +switch ($mode) { + case 'logout': + if ($app->getSession() === null) { + echo "You aren't logged in."; + } else { + echo "You've been logged out."; + set_cookie_m('uid', '', -3600); + set_cookie_m('sid', '', -3600); + $app->getSession()->delete(); + $app->setSession(null); + } + + echo ''; + break; + + case 'login': if ($app->getSession() !== null) { - return ''; + echo ''; + break; } if ($_SERVER['REQUEST_METHOD'] === 'GET') { - $twig = $app->templating; - return $twig->render('auth.login'); + echo $app->templating->render('auth.login'); + break; } if (!isset($_POST['username'], $_POST['password'])) { - return ['error' => "You didn't fill all the forms!"]; + echo json_encode_m(['error' => "You didn't fill all the forms!"]); + break; } $username = $_POST['username'] ?? ''; @@ -43,17 +58,19 @@ class AuthController extends Controller try { $user = User::where('username', $username)->orWhere('email', $username)->firstOrFail(); } catch (ModelNotFoundException $e) { - return ['error' => 'Invalid username or password!']; + echo json_encode_m(['error' => 'Invalid username or password!']); + break; } if (!$user->validatePassword($password)) { - return ['error' => 'Invalid username or password!']; + echo json_encode_m(['error' => 'Invalid username or password!']); + break; } - $session = Session::createSession($user, 'Misuzu T1'); + $session = Session::createSession($user, 'Misuzu T2'); $app->setSession($session); - $this->setCookie('uid', $session->user_id, 604800); - $this->setCookie('sid', $session->session_key, 604800); + set_cookie_m('uid', $session->user_id, 604800); + set_cookie_m('sid', $session->session_key, 604800); // Temporary key generation for chat login. // Should eventually be replaced with a callback login system. @@ -65,42 +82,30 @@ class AuthController extends Controller setcookie('msz_tmp_id', $user->user_id, time() + 604800, '/', '.flashii.net'); setcookie('msz_tmp_key', $user->user_chat_key, time() + 604800, '/', '.flashii.net'); - return ['error' => 'You are now logged in!', 'next' => '/']; - } - - private function setCookie(string $name, string $value, int $expires): void - { - setcookie( - "msz_{$name}", - $value, - time() + $expires, - '/', - '', - !empty($_SERVER['HTTPS']), - true - ); - } - - public function register() - { - $app = Application::getInstance(); - $prevent_registration = $app->config->get('Auth', 'prevent_registration', 'bool', false); + echo json_encode_m(['error' => 'You are now logged in!', 'next' => '/']); + break; + case 'register': if ($app->getSession() !== null) { return ''; } + $prevent_registration = $app->config->get('Auth', 'prevent_registration', 'bool', false); + if ($_SERVER['REQUEST_METHOD'] === 'GET') { $app->templating->var('prevent_registration', $prevent_registration); - return $app->templating->render('auth.register'); + echo $app->templating->render('auth.register'); + break; } if ($prevent_registration) { - return ['error' => 'Registration is not allowed on this instance.']; + echo json_encode_m(['error' => 'Registration is not allowed on this instance.']); + break; } if (!isset($_POST['username'], $_POST['password'], $_POST['email'])) { - return ['error' => "You didn't fill all the forms!"]; + echo json_encode_m(['error' => "You didn't fill all the forms!"]); + break; } $username = $_POST['username'] ?? ''; @@ -109,55 +114,42 @@ class AuthController extends Controller $email = $_POST['email'] ?? ''; if ($username_validate !== '') { - return ['error' => self::USERNAME_VALIDATION_ERRORS[$username_validate]]; + echo json_encode_m(['error' => $username_validation_errors[$username_validate]]); + break; } try { $existing = User::where('username', $username)->firstOrFail(); if ($existing->user_id > 0) { - return ['error' => 'This username is already taken!']; + echo json_encode_m(['error' => 'This username is already taken!']); + break; } } catch (ModelNotFoundException $e) { } if (!filter_var($email, FILTER_VALIDATE_EMAIL) || !check_mx_record($email)) { - return ['error' => 'The e-mail address you entered is invalid!']; + echo json_encode_m(['error' => 'The e-mail address you entered is invalid!']); + break; } try { $existing = User::where('email', $email)->firstOrFail(); if ($existing->user_id > 0) { - return ['error' => 'This e-mail address has already been used!']; + echo json_encode_m(['error' => 'This e-mail address has already been used!']); + break; } } catch (ModelNotFoundException $e) { } if (password_entropy($password) < 32) { - return ['error' => 'Your password is considered too weak!']; + echo json_encode_m(['error' => 'Your password is too weak!']); + break; } User::createUser($username, $password, $email); - return ['error' => 'Welcome to Flashii! You may now log in.', 'next' => '/auth/login']; - } - - public function logout() - { - $app = Application::getInstance(); - $session = $app->getSession(); - - if ($session === null) { - echo "You aren't logged in."; - } else { - echo "You've been logged out."; - $this->setCookie('uid', '', -3600); - $this->setCookie('sid', '', -3600); - $session->delete(); - $app->setSession(null); - } - - return ''; - } + echo json_encode_m(['error' => 'Welcome to Flashii! You may now log in.', 'next' => '/auth.php?m=login']); + break; } diff --git a/public/index.php b/public/index.php index a2b1fff0..0ebee2c0 100644 --- a/public/index.php +++ b/public/index.php @@ -1,24 +1,4 @@ startSession((int)$_COOKIE['msz_uid'], $_COOKIE['msz_sid']); -} - -$app->startRouter(); -$app->startTemplating(); - -include __DIR__ . '/../routes.php'; - -echo (new Dispatcher($app->router->getData()))->dispatch( - $_SERVER['REQUEST_METHOD'], - parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH) -); +echo $app->templating->render('home.landing'); diff --git a/public/profile.php b/public/profile.php new file mode 100644 index 00000000..3184ac79 --- /dev/null +++ b/public/profile.php @@ -0,0 +1,9 @@ +templating->vars(['profile' => User::findOrFail($user_id)]); +echo $app->templating->render('user.view'); diff --git a/src/Application.php b/src/Application.php index be08578a..78535149 100644 --- a/src/Application.php +++ b/src/Application.php @@ -3,7 +3,6 @@ namespace Misuzu; use Misuzu\Config\ConfigManager; use Misuzu\Users\Session; -use Phroute\Phroute\RouteCollector; use UnexpectedValueException; use InvalidArgumentException; @@ -124,7 +123,6 @@ class Application extends ApplicationBase $twig->addFunction('byte_symbol'); $twig->addFunction('session_id'); $twig->addFunction('config', [$this->config, 'get']); - $twig->addFunction('route', [$this->router, 'route']); $twig->addFunction('git_hash', [Application::class, 'gitCommitHash']); $twig->addFunction('git_branch', [Application::class, 'gitBranch']); @@ -132,16 +130,4 @@ class Application extends ApplicationBase $twig->addPath('nova', __DIR__ . '/../views/nova'); } - - /** - * Sets up the router module. - */ - public function startRouter(): void - { - if ($this->hasRouter) { - throw new UnexpectedValueException('Router module has already been started.'); - } - - $this->addModule('router', new RouteCollector); - } } diff --git a/src/Controllers/Controller.php b/src/Controllers/Controller.php deleted file mode 100644 index 73d3c025..00000000 --- a/src/Controllers/Controller.php +++ /dev/null @@ -1,6 +0,0 @@ -templating; - - return $twig->render('home.landing'); - } -} diff --git a/src/Controllers/UserController.php b/src/Controllers/UserController.php deleted file mode 100644 index 93f5abb9..00000000 --- a/src/Controllers/UserController.php +++ /dev/null @@ -1,16 +0,0 @@ -templating; - $twig->vars(['profile' => User::findOrFail($userId)]); - return $twig->render('user.view'); - } -} diff --git a/utility.php b/utility.php index c435808d..3b0da27c 100644 --- a/utility.php +++ b/utility.php @@ -16,6 +16,28 @@ if (!function_exists('ends_with')) { } } +function json_encode_m($obj): string +{ + if (!headers_sent()) { + header('Content-Type: application/json; charset=utf-8'); + } + + return json_encode($obj); +} + +function set_cookie_m(string $name, string $value, int $expires): void +{ + setcookie( + "msz_{$name}", + $value, + time() + $expires, + '/', + '', + !empty($_SERVER['HTTPS']), + true + ); +} + function password_entropy(string $password): int { return count(count_chars(utf8_decode($password), 1)) * log(256, 2); diff --git a/views/nova/auth/login.twig b/views/nova/auth/login.twig index e847013b..e8996eda 100644 --- a/views/nova/auth/login.twig +++ b/views/nova/auth/login.twig @@ -9,7 +9,7 @@ {% block content %}
- +
diff --git a/views/nova/auth/master.twig b/views/nova/auth/master.twig index 5965a52f..d30558b3 100644 --- a/views/nova/auth/master.twig +++ b/views/nova/auth/master.twig @@ -37,7 +37,7 @@ function authfSubmit() { - authHttp.open('POST', location.pathname, true); + authHttp.open('POST', location.pathname + '?m={{ auth_mode }}', true); authHttp.setRequestHeader("Content-Type", "application/x-www-form-urlencoded"); authHttp.send(authfForms()); } diff --git a/views/nova/home/landing.twig b/views/nova/home/landing.twig index 8c20c5f1..53dd036b 100644 --- a/views/nova/home/landing.twig +++ b/views/nova/home/landing.twig @@ -6,8 +6,8 @@
{% if app.session is null %}
- register - login + register + login

Keep an eye on Twitter!

diff --git a/views/nova/master.twig b/views/nova/master.twig index 35f24852..c3766005 100644 --- a/views/nova/master.twig +++ b/views/nova/master.twig @@ -16,13 +16,13 @@