diff --git a/requirements.txt b/requirements.txt
index 321e289fb..ab61c7037 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,18 @@
Flask==0.10.1
+Flask-Gravatar==0.4.1
+Flask-Login==0.2.11
+Flask-Mail==0.9.1
+Flask-Principal==0.4.0
+Flask-SQLAlchemy==2.0
+Flask-Security==1.7.4
+Flask-WTF==0.11
Jinja2==2.7.3
MarkupSafe==0.23
+SQLAlchemy==0.9.8
+WTForms==2.0.2
Werkzeug==0.9.6
+blinker==1.3
itsdangerous==0.24
+passlib==1.6.2
psycopg2==2.5.2
wsgiref==0.1.2
diff --git a/web/config.py b/web/config.py
index 2535d3396..4afea8460 100644
--- a/web/config.py
+++ b/web/config.py
@@ -10,6 +10,7 @@
##########################################################################
from logging import *
+import os
##########################################################################
# Application settings
@@ -73,11 +74,48 @@ CSRF_ENABLED = True
# Secret key for signing CSRF data. Override this in config_local.py if
# running on a web server
-CSRF_SESSION_KEY = 'SuperSecret'
+CSRF_SESSION_KEY = 'SuperSecret1'
# Secret key for signing cookies. Override this in config_local.py if
# running on a web server
-SECRET_KEY = 'SuperSecret'
+SECRET_KEY = 'SuperSecret2'
+
+# Salt used when hashing passwords. Override this in config_local.py if
+# running on a web server
+SECURITY_PASSWORD_SALT = 'SuperSecret3'
+
+# Hashing algorithm used for password storage
+SECURITY_PASSWORD_HASH = 'pbkdf2_sha512'
+
+##########################################################################
+# User account and settings storage
+##########################################################################
+
+# The default path to the SQLite database used to store user accounts and
+# settings. This default places the file in the same directory as this
+# config file, but generates an absolute path for use througout the app.
+SQLITE_PATH = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'pgadmin4.db')
+
+##########################################################################
+# Mail server settings
+##########################################################################
+
+# These settings are used when running in web server mode for confirming
+# and resetting passwords etc.
+MAIL_SERVER = 'smtp.gmail.com'
+MAIL_PORT = 465
+MAIL_USE_SSL = True
+MAIL_USERNAME = 'username'
+MAIL_PASSWORD = 'SuperSecret'
+
+##########################################################################
+# Mail content settings
+##########################################################################
+
+# These settings define the content of password reset emails
+SECURITY_EMAIL_SUBJECT_PASSWORD_RESET = "Password reset instructions for %s" % APP_NAME
+SECURITY_EMAIL_SUBJECT_PASSWORD_NOTICE = "Your %s password has been reset" % APP_NAME
+SECURITY_EMAIL_SUBJECT_PASSWORD_CHANGE_NOTICE = "Your password for %s has been changed" % APP_NAME
##########################################################################
# Local config settings
diff --git a/web/pgadmin/__init__.py b/web/pgadmin/__init__.py
index 67df40f91..13cc2fca8 100644
--- a/web/pgadmin/__init__.py
+++ b/web/pgadmin/__init__.py
@@ -10,8 +10,13 @@
"""The main pgAdmin module. This handles the application initialisation tasks,
such as setup of logging, dynamic loading of modules etc."""
-import inspect, logging, os
from flask import Flask
+from flask.ext.sqlalchemy import SQLAlchemy
+from flask.ext.security import Security, SQLAlchemyUserDatastore, login_required
+from flask_mail import Mail
+from settings_model import db, Role, User
+
+import inspect, logging, os
# Configuration settings
import config
@@ -56,7 +61,26 @@ def create_app(app_name=config.APP_NAME):
app.logger.info('Starting %s v%s...', config.APP_NAME, config.APP_VERSION)
app.logger.info('################################################################################')
- # Register all the modules
+ ##########################################################################
+ # Setup authentication
+ ##########################################################################
+
+ app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///' + config.SQLITE_PATH.replace('\\', '/')
+ app.config['SECURITY_RECOVERABLE'] = True
+ app.config['SECURITY_CHANGEABLE'] = True
+
+ # Create database connection object and mailer
+ db.init_app(app)
+ mail = Mail(app)
+
+ # Setup Flask-Security
+ user_datastore = SQLAlchemyUserDatastore(db, User, Role)
+ security = Security(app, user_datastore)
+
+ ##########################################################################
+ # Load plugin modules
+ ##########################################################################
+
path = os.path.dirname(os.path.realpath(__file__))
files = os.listdir(path)
for f in files:
@@ -76,7 +100,6 @@ def create_app(app_name=config.APP_NAME):
app.logger.info('Registering blueprint module: %s' % f)
app.register_blueprint(module.views.blueprint)
+ # All done!
app.logger.debug('URL map: %s' % app.url_map)
-
return app
-
diff --git a/web/pgadmin/browser/__init__.py b/web/pgadmin/browser/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/web/pgadmin/browser/templates/index.html b/web/pgadmin/browser/templates/index.html
new file mode 100644
index 000000000..b01030a99
--- /dev/null
+++ b/web/pgadmin/browser/templates/index.html
@@ -0,0 +1,46 @@
+{% extends "base.html" %}
+{% block body %}
+
+
+
+
+{% include 'messages.html' %}
+{% endblock %}
diff --git a/web/pgadmin/browser/templates/messages.html b/web/pgadmin/browser/templates/messages.html
new file mode 100644
index 000000000..e0c886cd6
--- /dev/null
+++ b/web/pgadmin/browser/templates/messages.html
@@ -0,0 +1,12 @@
+{%- with messages = get_flashed_messages(with_categories=true) -%}
+ {% if messages %}
+
+ {% for category, message in messages %}
+
+
+ {{ message }}
+
+ {% endfor %}
+
+
+
+{% if field.errors %}
+{% for error in field.errors %}
+{{ error }}
+{% endfor %}
+{% endif %}
+{% endmacro %}
diff --git a/web/pgadmin/templates/security/forgot_password.html b/web/pgadmin/templates/security/forgot_password.html
new file mode 100644
index 000000000..20ef2079f
--- /dev/null
+++ b/web/pgadmin/templates/security/forgot_password.html
@@ -0,0 +1,12 @@
+{% extends "security/panel.html" %}
+{% block panel_title %}Recover pgAdmin Password{% endblock %}
+{% block panel_body %}
+Enter the email address for the user account you wish to recover the password for:
+
+{% endblock %}
diff --git a/web/pgadmin/templates/security/login_user.html b/web/pgadmin/templates/security/login_user.html
new file mode 100644
index 000000000..cebefa360
--- /dev/null
+++ b/web/pgadmin/templates/security/login_user.html
@@ -0,0 +1,13 @@
+{% extends "security/panel.html" %}
+{% block panel_title %}pgAdmin Login{% endblock %}
+{% block panel_body %}
+
+Forgotten your password?
+{% endblock %}
diff --git a/web/pgadmin/templates/security/messages.html b/web/pgadmin/templates/security/messages.html
new file mode 100644
index 000000000..d6b758da0
--- /dev/null
+++ b/web/pgadmin/templates/security/messages.html
@@ -0,0 +1,12 @@
+{%- with messages = get_flashed_messages(with_categories=true) -%}
+ {% if messages %}
+
+ {% for category, message in messages %}
+
+
+ {{ message }}
+
+ {% endfor %}
+
+ {% include "security/messages.html" %}
+
+
+
+
+
{% block panel_title %}{% endblock %}
+
+
+ {% block panel_body %}
+ {% endblock %}
+
+
+
+
+
+
+