From 3183f56a4ad2fdeaf3501862f7f4d9d29f0e4d58 Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Fri, 25 Oct 2019 21:54:46 +1100
Subject: [PATCH] relax password restrictions

---
 client/src/components/welcome.register.jsx    |  2 +-
 .../mnml.gg.PRODUCTION.nginx.conf             | 23 -------------------
 server/src/account.rs                         |  4 ++--
 server/src/rpc.rs                             |  2 +-
 4 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/client/src/components/welcome.register.jsx b/client/src/components/welcome.register.jsx
index 5eb2b17d..68b6fedb 100644
--- a/client/src/components/welcome.register.jsx
+++ b/client/src/components/welcome.register.jsx
@@ -58,7 +58,7 @@ function Register(args) {
                 value={this.state.name}
                 onInput={linkState(this, 'name')}
             />
-            <label for="password">Password - min 12 chars</label>
+            <label for="password">Password - min 4 chars</label>
             <input
                 class="login-input"
                 type="password"
diff --git a/etc/nginx/sites-available/mnml.gg.PRODUCTION.nginx.conf b/etc/nginx/sites-available/mnml.gg.PRODUCTION.nginx.conf
index c19c1f9d..82567688 100644
--- a/etc/nginx/sites-available/mnml.gg.PRODUCTION.nginx.conf
+++ b/etc/nginx/sites-available/mnml.gg.PRODUCTION.nginx.conf
@@ -63,24 +63,6 @@ server {
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
 }
 
-server {
-    server_name minimalstudios.com.au;
-
-    location / {
-        root /var/lib/mnml/public/press/;
-        index index.html;
-        try_files $uri $uri/ index.html;
-    }
-
-    listen 443 ssl; # managed by Certbot
-    ssl_certificate /etc/letsencrypt/live/minimalstudios.com.au/fullchain.pem; # managed by Certbot
-    ssl_certificate_key /etc/letsencrypt/live/minimalstudios.com.au/privkey.pem; # managed by Certbot
-    include /etc/letsencrypt/options-ssl-nginx.conf; # managed by Certbot
-    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem; # managed by Certbot
-}
-
-
-
 # http -> https
 server {
     server_name mnml.gg;
@@ -91,8 +73,3 @@ server {
     server_name minimal.gg;
     return 301 https://mnml.gg$request_uri;
 }
-
-server {
-    server_name minimalstudios.com.au;
-    return 301 https://minimalstudios.com.au$request_uri;
-}
diff --git a/server/src/account.rs b/server/src/account.rs
index e42ca9e9..22224568 100644
--- a/server/src/account.rs
+++ b/server/src/account.rs
@@ -20,7 +20,7 @@ use img;
 use failure::Error;
 use failure::{err_msg, format_err};
 
-static PASSWORD_MIN_LEN: usize = 11;
+static PASSWORD_MIN_LEN: usize = 3;
 
 #[derive(Debug,Clone,Serialize,Deserialize)]
 pub struct Account {
@@ -318,7 +318,7 @@ pub fn set_subscribed(tx: &mut Transaction, id: Uuid, subscribed: bool) -> Resul
 }
 
 pub fn create(name: &String, password: &String, tx: &mut Transaction) -> Result<String, MnmlHttpError> {
-    if password.len() < PASSWORD_MIN_LEN {
+    if password.len() < PASSWORD_MIN_LEN || password.len() > 100 {
         return Err(MnmlHttpError::PasswordUnacceptable);
     }
 
diff --git a/server/src/rpc.rs b/server/src/rpc.rs
index f4019ad3..826590c9 100644
--- a/server/src/rpc.rs
+++ b/server/src/rpc.rs
@@ -449,7 +449,7 @@ pub fn start(pool: PgPool, events_tx: CbSender<Event>, stripe: StripeClient) {
                             out.send(Message::Binary(response)).unwrap();
                         }
                         // we done
-                        Err(e) => {
+                        Err(_e) => {
                             // info!("{:?}", e);
                             break;
                         },