From 34414fb0d45c274a03a8b01de4688e8ae50702c2 Mon Sep 17 00:00:00 2001
From: Alon Levy <alon@pobox.com>
Date: Mon, 12 Jan 2015 11:01:32 +0200
Subject: server: add 404 redirection (no error page), Fixes #210

---
 src/server/rz_server.py | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src')

diff --git a/src/server/rz_server.py b/src/server/rz_server.py
index 8693ef52..023cd880 100644
--- a/src/server/rz_server.py
+++ b/src/server/rz_server.py
@@ -230,6 +230,13 @@ def init_rest_interface(cfg, flask_webapp):
 
         flask_webapp.f = f  # assign decorated function
 
+    # install 404 handler to redirect to root - which redirects further to login (index if access disabled)
+    @flask_webapp.errorhandler(404)
+    def page_not_found(e):
+        # FIXME: template for 404 which redirects (html, not http)
+        return redirect('/')
+
+
 def init_webapp(cfg, kernel, db_ctl=None):
     """
     Initialize webapp:
-- 
cgit v1.3.1


From db5dfcbec8cc1fa2ea9110f59adcd7972bd657a9 Mon Sep 17 00:00:00 2001
From: Alon Levy <alon@pobox.com>
Date: Mon, 12 Jan 2015 11:19:39 +0200
Subject: server: implement init_pw_db, update docs, set default
 Config.htpasswd_path to <config-dir>/htpasswd

TODO: permissions - warn on lax permissions for password file (and for
init file?)
---
 README.mediawiki        | 14 ++++++++++++++
 src/server/rz_server.py | 10 ++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/README.mediawiki b/README.mediawiki
index 1484ffc3..58fda93e 100644
--- a/README.mediawiki
+++ b/README.mediawiki
@@ -25,13 +25,27 @@ To run Rhizi locally:
 For testing locally run neo4j locally on the default 7474 port and then launch run-local.sh:<br><code>./run-local.sh</code>
 
 Or perform the following tasks by hand:
+# Update css files from scss sources using <code>make</code>
 # Invoke the local deployment Ant target:<br><code>$ cd ./rhizi && ant -f build.ant deploy-local</code>
 # Assert Neo4J is running and listening on it's default port
 # Run rhizi-server.py:<br><code>$ cd deploy-local && python bin/rz_server.py --config-dir=etc</code>
 
 Command line use documentation can be view with:
 :$ python rz_server.py -h
+
+== Installation ==
+
+=== Setup user password file ===
+The following works in conjunction with run-local.sh, for real deployment place the resulting htpasswd file in the location matching the config you use.
+# put a SECRET_KEY entry in the config file:
+  echo SECRET_KEY=mysecret >> res/etc/rhizi-server.conf
+# create an initialization file with email/password separated by a comma:
+  echo test@example.com,test > res/etc/htpasswd-init-file
+# create the htpasswd file:
+  python src/server/rz_server.py --init-htpasswd-db --htpasswd-init-file res/etc/htpasswd-init-file
+
 = Development =
+
 To update the css files you need [sass](http://sass-lang.com/)
 
 The build tool is [make](https://www.gnu.org/software/make/)
diff --git a/src/server/rz_server.py b/src/server/rz_server.py
index 023cd880..88f2e9f0 100644
--- a/src/server/rz_server.py
+++ b/src/server/rz_server.py
@@ -58,6 +58,7 @@ class Config(object):
         cfg['listen_port'] = 8080
         cfg['root_path'] = os.getcwd()
         cfg['static_url_path'] = '/static'
+        cfg['htpasswd_path'] = os.path.join(cfg['config_dir'], 'htpasswd')
 
         # Flask keys
         cfg['SECRET_KEY'] = ''
@@ -269,8 +270,13 @@ def init_config(cfg_dir):
     return cfg
 
 def init_pw_db(cfg, user_pw_list_file):
-    pass  # TODO: stub, will move to tools/
-
+    if not os.path.exists(user_pw_list_file):
+        print("error: missing specified htpasswd init file '%s'" % user_pw_list_file)
+        raise SystemExit
+    with open(user_pw_list_file) as user_pwd_list_fd:
+        for line in user_pwd_list_fd:
+            u, p = [word.strip() for word in line.split(',')]
+            crypt_util.add_user_login(cfg, u, p)
 
 if __name__ == "__main__":
 
-- 
cgit v1.3.1


From f6def5675506a35d8be6461411de4626fb71f29e Mon Sep 17 00:00:00 2001
From: Alon Levy <alon@pobox.com>
Date: Mon, 12 Jan 2015 11:40:33 +0200
Subject: server/404: add debug print of request

---
 src/server/rz_server.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/server/rz_server.py b/src/server/rz_server.py
index 88f2e9f0..64a85588 100644
--- a/src/server/rz_server.py
+++ b/src/server/rz_server.py
@@ -235,6 +235,7 @@ def init_rest_interface(cfg, flask_webapp):
     @flask_webapp.errorhandler(404)
     def page_not_found(e):
         # FIXME: template for 404 which redirects (html, not http)
+        log.debug("failed redirection: request = %s" % request)
         return redirect('/')
 
 
-- 
cgit v1.3.1


From 2974f916df0614c892a94d3e0f192e10aa03b0b6 Mon Sep 17 00:00:00 2001
From: Alon Levy <alon@pobox.com>
Date: Mon, 12 Jan 2015 11:41:12 +0200
Subject: server/client: s/res/static/, drop dev_mode__resend_from_static

---
 res/templates/index.html | 10 +++++-----
 res/templates/login.html |  6 +++---
 src/client/app.js        |  2 +-
 src/server/rz_server.py  | 22 ----------------------
 4 files changed, 9 insertions(+), 31 deletions(-)

(limited to 'src')

diff --git a/res/templates/index.html b/res/templates/index.html
index cba394d6..13913ba2 100644
--- a/res/templates/index.html
+++ b/res/templates/index.html
@@ -2,11 +2,11 @@
 <head>
     <title>Rhizi Prototype </title>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-  <link href="/res/css/style.css" rel="stylesheet" type="text/css">
-    <link rel="shortcut icon" href="/res/img/favicon2.ico" />
+  <link href="/static/css/style.css" rel="stylesheet" type="text/css">
+    <link rel="shortcut icon" href="/static/img/favicon2.ico" />
 
     <script src="/static/local_config.js"></script>
-    <script data-main='/static/app.js' src="/res/lib/require.js"></script>
+    <script data-main='/static/app.js' src="/static/lib/require.js"></script>
 
 </head>
 
@@ -25,7 +25,7 @@
         <span class="profile-initials">AN<!-- must be two letters because of css --></span>
          <div class="profile-username">Welcome&nbsp;<span id="user_id">Anonymous</span>! <span id="logout-button" class="button">Logout</span></div>
       </div>
-      <img class="organization-logo" src="/res/img/CRI-logo.png">
+      <img class="organization-logo" src="/static/img/CRI-logo.png">
     </div>
   </div>
   <div class="search-bar">
@@ -123,7 +123,7 @@
   </div>
 
   <div class="rhizi-logo"><a href="http://www.rhizi.org">
-    <img src="/res/img/rhizi-logo.png"/></a>
+    <img src="/static/img/rhizi-logo.png"/></a>
   </div>
   </div>
 
diff --git a/res/templates/login.html b/res/templates/login.html
index 8ddde1b2..000395c2 100644
--- a/res/templates/login.html
+++ b/res/templates/login.html
@@ -2,7 +2,7 @@
 <head>
 <meta charset="UTF-8">
 <title>Welcome to Rhizi</title>
-<link href="/res/css/style.css" rel="stylesheet" type="text/css">
+<link href="/static/css/style.css" rel="stylesheet" type="text/css">
 <script src="/static/lib/jquery.js" type="text/javascript"></script>
 <script type="text/javascript">
     function submit_login_form() {
@@ -28,7 +28,7 @@
 
 <body class="login-background">
 	<div class="welcome-box">
-		<img src="/res/img/logo-red.png" class="login-rhizi-logo">
+		<img src="/static/img/logo-red.png" class="login-rhizi-logo">
 		<div class="login-text">
 			<h1 class="login-header"> Welcome to Rhizi!</h1>
 			<h5>Rhizi is a collaborative knowledge editor.</h5>
@@ -52,7 +52,7 @@
 				{% if login_failed %}<b>Login Failed</b>{% endif %}
 			</div>
 		</div>
-		<img src="res/img/hr-email-icon.png">
+		<img src="static/img/hr-email-icon.png">
 		<p class="login-text"><a href="mailto:dor.garbash@gmail.com">Send us an Email</a> about your experience, especially if you encountered any problem!</p>
 
 
diff --git a/src/client/app.js b/src/client/app.js
index 4d15f342..4bb762d5 100644
--- a/src/client/app.js
+++ b/src/client/app.js
@@ -1,5 +1,5 @@
 (function() {
-    var lib_path = '/res/lib/';
+    var lib_path = '/static/lib/';
     var config = {
         shim: {
             'socketio': { exports: 'io' },
diff --git a/src/server/rz_server.py b/src/server/rz_server.py
index 64a85588..e8fec231 100644
--- a/src/server/rz_server.py
+++ b/src/server/rz_server.py
@@ -166,19 +166,6 @@ def init_rest_interface(cfg, flask_webapp):
         redirector.func_name = 'redirector_%s' % path.replace('/', '_')
         return (path, redirector, flask_args)
 
-    def dev_mode__resend_from_static(static_url):
-        """
-        redirect static links while in dev mode:
-           - /res/<path> -> <path>
-        """
-        static_folder = flask.current_app.static_folder
-
-        new_req_path = None
-        if request.path.startswith('/res/'):
-            # turn absolute/res/... URLs to static-folder relative
-            new_req_path = request.path.replace('/res/', '')
-        return send_from_directory(static_folder, new_req_path)
-
     def login_decorator(f):
         """
         [!] security boundary: asserd logged-in user before executing REST api call
@@ -209,15 +196,6 @@ def init_rest_interface(cfg, flask_webapp):
                       rest_entry('/monitor/server-info', rz_api.monitor__server_info),
                   ]
 
-    if cfg.development_mode:
-        dev_path_set = ['/static', '/res']
-        rest_dev_entry_set = []
-        for dev_path in dev_path_set:
-            rest_dev_entry_set.append(rest_entry(dev_path + '/<path:static_url>',
-                                                 dev_mode__resend_from_static,
-                                                 {'methods': ['GET']}))
-        rest_entry_set += rest_dev_entry_set
-
     for re_entry in rest_entry_set:
         rest_path, f, flask_args = re_entry
 
-- 
cgit v1.3.1