staring the user profile page

Author: bashwork

TODO.rst

@@ -4,10 +4,10 @@ speleo.frontend
 
 * I18N
 * testing (performance, memory leaks)
-* add one page routing (server/frontend/both?)
-* save page state between switches (service)
 * attach link to hue(configure)
 
+  - pluggable utilities
+
 --------------------------------------------------------
 common ui components
 --------------------------------------------------------
@@ -25,8 +25,16 @@ user profile page
 --------------------------------------------------------
 
 * past dashboards
-* blocks
+* blocks /queries
 * information (readonly)
+* roles
+
+--------------------------------------------------------
+user admin page
+--------------------------------------------------------
+
+* user management
+* roles apply
 
 --------------------------------------------------------
 plugins
@@ -42,7 +50,6 @@ Speleo Settings
 --------------------------------------------------------
 
 * add chicken test to shutdown/delete
-* add roles
 * add all possible settings and bind them
 
 ========================================================
@@ -59,6 +66,8 @@ elastic search proxy
   - index schema
   - analyzers
 
+* analyzer api dsl
+
 --------------------------------------------------------
 service api
 --------------------------------------------------------
@@ -74,7 +83,7 @@ service alerts
 --------------------------------------------------------
 
 * configure via service
-* monitoring service to send
+* speleo.monitor (percolations)
 
   - email
   - sms
@@ -118,7 +127,6 @@ Speleo Dashboard
 Speleo Search
 --------------------------------------------------------
 
-* query builder -> convert query to elastic search
 * click on chart and chart filter
 * sidebar for suggested tag filter
 * speed up slow updates

speleo.service/service/common.py

@@ -0,0 +1,11 @@
+from tornado.options import define, options
+
+def dict_to_options(**kwargs):
+    ''' A helper method to quickly convert a dict to options
+
+    :param kwargs: The arguments to convert to options
+    '''
+    for key, value in kwargs.items():
+        define(key, default=value, type=type(value))
+    return options
+

speleo.service/service/handlers/__init__.py

@@ -1,3 +1,4 @@
+from service.handlers.error_handler import *
 from service.handlers.root_handler import *
 from service.handlers.contact_handler import *
 from service.handlers.search_handler import *
@@ -7,3 +8,4 @@
 from service.handlers.auth_handler import *
 from service.handlers.simple_handler import *
 from service.handlers.elastic_handler import *
+from service.handlers.profile_handler import *

speleo.service/service/handlers/auth_handler.py

@@ -3,6 +3,28 @@
 import tornado.auth
 import tornado.web
 from service.handlers.common import BaseHandler
+from service.models import User
+
+
+# ------------------------------------------------------------
+# helper methods
+# ------------------------------------------------------------
+def save_user(database, attributes):
+    ''' Given a user, save if the user doesn't exist
+    otherwise update its data.
+
+    :param database: The database to save to
+    :param attributes: The attributes to update with
+    :returns: The user identifier
+    '''
+    user = database.query(User
+        ).filter_by(username=attributes['username']).first()
+    if not user:
+        user = User(**attributes)
+        database.add(user)
+        database.commit()
+        logging.debug('saved new user %s' % user.id)
+    return u"%s" % user.id
 
 
 # ------------------------------------------------------------
@@ -20,7 +42,7 @@ def post(self):
         password = self.get_argument('password', '')
         session  = self.security.authenticate(username, password)
         if session:
-            self.set_secure_cookie('user', tornado.escape.json_encode(session))
+            self.set_secure_cookie('user', save_user(self.db, session))
             self.redirect(self.get_argument('next', '/'))
         else: self.redirect('/auth/login')
 
@@ -39,7 +61,7 @@ def get(self):
     def _on_auth(self, user):
         if not user:
             raise tornado.web.HTTPError(500, "Google authentication failed")
-        self.set_secure_cookie("user", tornado.escape.json_encode(user))
+        self.set_secure_cookie('user', save_user(self.db, session))
         self.redirect(self.get_argument("next", "/"))
 
 
@@ -57,7 +79,7 @@ def get(self):
     def _on_auth(self, user):
         if not user:
             raise tornado.web.HTTPError(500, "Twitter authentication failed")
-        self.set_secure_cookie("user", tornado.escape.json_encode(user))
+        self.set_secure_cookie('user', save_user(self.db, session))
         self.redirect(self.get_argument("next", "/"))
 
 
@@ -75,7 +97,7 @@ def get(self):
     def _on_auth(self, user):
         if not user:
             raise tornado.web.HTTPError(500, "Facebook authentication failed")
-        self.set_secure_cookie("user", tornado.escape.json_encode(user))
+        self.set_secure_cookie('user', save_user(self.db, session))
         self.redirect(self.get_argument("next", "/"))
 
 

speleo.service/service/handlers/common.py

@@ -1,5 +1,6 @@
 import tornado.web
 import tornado.escape
+from service.models import User
 
 class BaseHandler(tornado.web.RequestHandler):
 
@@ -20,6 +21,6 @@ def cache(self):
         return self.application.cache
 
     def get_current_user(self):
-        user_json = self.get_secure_cookie("user")
-        if not user_json: return None
-        return tornado.escape.json_decode(user_json)
+        user_id = self.get_secure_cookie("user")
+        if not user_id: return None
+        return self.db.query(User).get(user_id)

speleo.service/service/handlers/error_handler.py

@@ -0,0 +1,46 @@
+import os
+import httplib
+import tornado.web
+
+class ErrorHandler(tornado.web.RequestHandler):
+
+    _template = """
+<html>
+  <head>
+  <title>%(code)d %(message)s</title>
+  <style>
+body  { background: #fff; color: #000; }
+#main { padding: 10em; }
+#main h1 { font-size:40px; }
+#main img { opacity: 0.3; position:absolute; top:10em; left:30em; -webkit-transform:scale(1.5); }
+  </style>
+  </head>
+  <body><div id='main'>
+    <h1>%(code)d %(message)s</h1>
+    <p>Not much else to see here...</p>
+    <a href="/">Let's get you home</a>
+    <img src='/static/img/helmet.png' />
+  </div></body>
+</html>
+"""
+
+    def __init__(self, application, request, status_code):
+        tornado.web.RequestHandler.__init__(self, application, request)
+        self.set_status(status_code)
+    
+    def get_error_html(self, status_code, **kwargs):
+        return self._template % {
+            "code":    status_code,
+            "message": httplib.responses[status_code],
+        }
+    
+    def prepare(self):
+        raise tornado.web.HTTPError(self._status_code)
+
+## override the tornado.web.ErrorHandler with our default ErrorHandler
+tornado.web.ErrorHandler = ErrorHandler
+
+# ------------------------------------------------------------
+# exports
+# ------------------------------------------------------------
+__all__ = []

speleo.service/service/handlers/profile_handler.py

@@ -0,0 +1,48 @@
+import tornado.web
+from service.handlers.common import BaseHandler
+
+class ProfileHandler(BaseHandler):
+
+    RoutePath = r'/profile/?'
+
+    def get(self):
+        self.render('profile.html')
+
+    def post(self):
+        pass
+
+
+# ------------------------------------------------------------
+# api methods
+# ------------------------------------------------------------
+class QueryApiHandler(BaseHandler):
+
+    RoutePath = r'/api/v1/user/query/(.*)'
+
+    @tornado.web.authenticated
+    def get(self, qid):
+        queries = self.get_current_user().queries
+        if query: 
+            queries = [q for q in queries if q.id == qid]
+        self.write({ 'data' : queries })
+
+    @tornado.web.authenticated
+    def post(self, qid):
+        # create or update
+        pass
+
+    @tornado.web.authenticated
+    def delete(self, qid):
+        queries = self.get_current_user().queries
+        for query in queries:
+            if query.id == qid:
+                queries.remove(query)
+        if self.db.is_dirty(): self.db.commit()
+        self.write({ 'data': 'OK' })
+
+    put = post
+
+# ------------------------------------------------------------
+# exports
+# ------------------------------------------------------------
+__all__ = ['ProfileHandler']

speleo.service/service/models.py

@@ -41,15 +41,29 @@ class User(Base):
     def __repr__(self):
         return "<User(%s)>" % (self.username)
 
+
+class Role(Base):
+
+    __tablename__ = 'roles'
+
+    id = Column(Integer, primary_key=True)
+    name = Column(String(50), nullable=False)
+    description = Column(String(100), nullable=False)
+
+    def __repr__(self):
+        return "<Role(%s)>" % (self.name)
+
+
 class Query(Base):
 
     __tablename__ = 'queries'
 
     id = Column(Integer, primary_key=True)
-    display = Column(String(250), nullable=False)
-    compiled = Column(String(250), nullable=False)
+    title = Column(String(50), nullable=False)
+    display = Column(String(200), nullable=False)
+    compiled = Column(String(200), nullable=True)
     user_id = Column(Integer, ForeignKey('users.id'))
     user = relationship("User", backref=backref('queries', order_by=id))
 
     def __repr__(self):
-        return "<Query(%s, %s)>" % (self.user.username, self.query)
+        return "<Query(%s, %s)>" % (self.user.username, self.title)

speleo.service/service/security.py

@@ -1,5 +1,5 @@
 import crypt
-import pwd, spwd
+import pwd, spwd, grp
 import logging
 
 try:
@@ -23,8 +23,8 @@ def authenticate(self, username, password):
         '''
         logging.info("user %s logged in" % username)
         return {
-            'name':     username,
-            'username': username,
+            'name':       username,
+            'username':   username,
         }
 
 
@@ -130,9 +130,9 @@ class UnixSecurity(object):
     __fields = {
         'name':     { 'group': False, 'field': 'pw_name',  },
         'username': { 'group': False, 'field': 'pw_name',  },
-        'uid':      { 'group': False, 'field': 'pw_uid',   },
-        'gid':      { 'group': False, 'field': 'pw_gid',   },
-        'comment':  { 'group': False, 'field': 'pw_gecos', },
+        #'id':       { 'group': False, 'field': 'pw_uid',   },
+        'email':    { 'group': False, 'field': 'pw_gecos', },
+        #'gid':      { 'group': False, 'field': 'pw_gid',   },
     }
     __attrs = [m['field'] for m in __fields.values()]
 
@@ -166,8 +166,15 @@ def _parse_fields(self, attrs):
         result = {}
         for key, meta in self.__fields.items():
             result[key] = getattr(attrs, meta['field'])
+        #self._get_group_roles(result)
         return result
 
+    def _get_group_roles(self, user):
+        user['roles'] = []
+        for group in grp.getgrall():
+            if user['username'] in group.gr_mem:
+                user['roles'].append(group.gr_name)
+
 def get_security(options):
     ''' Factory for the security implementations
 

speleo.service/static/css/main.css

@@ -193,3 +193,7 @@ body {
   line-height:20px;
   padding: 10px;
 }
+
+.profile-title {
+  margin-bottom: 1em;
+}