Merge branch 'master' into v2

app.py

@@ -5,32 +5,31 @@ import yaml
 
 from flask import Flask as BaseFlask, Config as BaseConfig, request, Request
 from flask.ext.principal import Principal
-from flask.ext.login import LoginManager
+from flask.ext.login import LoginManager, UserMixin
 from flask.ext.mail import Mail
 
 import features
 
+from avatars.avatars import Avatar
 from storage import Storage
 from data import model
 from data import database
 from data.userfiles import Userfiles
 from data.users import UserAuthentication
-from util.analytics import Analytics
-from util.exceptionlog import Sentry
-from util.queuemetrics import QueueMetrics
-from util.names import urn_generator
-from util.oauth import GoogleOAuthConfig, GithubOAuthConfig
 from data.billing import Billing
 from data.buildlogs import BuildLogs
 from data.archivedlogs import LogArchive
-from data.queue import WorkQueue
 from data.userevent import UserEventsBuilderModule
-from avatars.avatars import Avatar
+from data.queue import WorkQueue
+from util.analytics import Analytics
+from util.exceptionlog import Sentry
+from util.names import urn_generator
+from util.oauth import GoogleOAuthConfig, GithubOAuthConfig
 from util.signing import Signer
+from util.queuemetrics import QueueMetrics
+
 
 # pylint: disable=invalid-name,too-many-public-methods,too-few-public-methods,too-many-ancestors
-
-
 class Config(BaseConfig):
   """ Flask config enhanced with a `from_yamlfile` method """
 
@@ -134,17 +133,18 @@ analytics = Analytics(app)
 billing = Billing(app)
 sentry = Sentry(app)
 build_logs = BuildLogs(app)
-queue_metrics = QueueMetrics(app)
 authentication = UserAuthentication(app)
 userevents = UserEventsBuilderModule(app)
 signer = Signer(app, OVERRIDE_CONFIG_DIRECTORY)
+queue_metrics = QueueMetrics(app)
+
+tf = app.config['DB_TRANSACTION_FACTORY']
 
 github_login = GithubOAuthConfig(app, 'GITHUB_LOGIN_CONFIG')
 github_trigger = GithubOAuthConfig(app, 'GITHUB_TRIGGER_CONFIG')
 google_login = GoogleOAuthConfig(app, 'GOOGLE_LOGIN_CONFIG')
 oauth_apps = [github_login, github_trigger, google_login]
 
-tf = app.config['DB_TRANSACTION_FACTORY']
 image_diff_queue = WorkQueue(app.config['DIFFS_QUEUE_NAME'], tf)
 dockerfile_build_queue = WorkQueue(app.config['DOCKERFILE_BUILD_QUEUE_NAME'], tf,
                                    reporter=queue_metrics.report)
@@ -154,5 +154,29 @@ database.configure(app.config)
 model.config.app_config = app.config
 model.config.store = storage
 
+@login_manager.user_loader
+def load_user(user_uuid):
+  logger.debug('User loader loading deferred user with uuid: %s' % user_uuid)
+  return LoginWrappedDBUser(user_uuid)
+
+class LoginWrappedDBUser(UserMixin):
+  def __init__(self, user_uuid, db_user=None):
+    self._uuid = user_uuid
+    self._db_user = db_user
+
+  def db_user(self):
+    if not self._db_user:
+      self._db_user = model.get_user_by_uuid(self._uuid)
+    return self._db_user
+
+  def is_authenticated(self):
+    return self.db_user() is not None
+
+  def is_active(self):
+    return self.db_user().verified
+
+  def get_id(self):
+    return unicode(self._uuid)
+
 def get_app_url():
   return '%s://%s' % (app.config['PREFERRED_URL_SCHEME'], app.config['SERVER_HOSTNAME'])