Differential D1030

Remove the login page
ClosedPublic
Actions

Authored by mprahl on Oct 17 2016, 8:23 PM.

Details

Reviewers
tflink
jskladan
Commits
rRSDB1b881c3da6cd: Remove the login page and user table
Summary

Remove the login page in order to remove the dependency for flask-login, and flask-wtf. We'd like to run this on EPEL 7 without adding flask-login as a dependency.

Test Plan

Run the unit tests

Run Docker and test adding data

Diff Detail

Repository
rRSDB resultsdb
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
mprahl retitled this revision from to Remove the login page.Oct 17 2016, 8:23 PM
mprahl updated this object.
mprahl edited the test plan for this revision. (Show Details)
mprahl added reviewers: jskladan, tflink.
mprahl added a subscriber: • ralph2.
mprahl updated this revision to Diff 2633.Oct 17 2016, 8:33 PM
  • Remove flask-wtf
mprahl updated this object.Oct 17 2016, 8:40 PM
mprahl edited the test plan for this revision. (Show Details)
tflink added a comment.Oct 17 2016, 9:54 PM

I'm fine with this but I'd like to wait for @jskladan to review the patch before actually applying it.

jskladan accepted this revision.Oct 18 2016, 6:36 AM

Fine with me, we'll be adding some auth in the future, but this does not really make it any more difficult than it will be.

This revision is now accepted and ready to land.Oct 18 2016, 6:36 AM
Closed by commit rRSDB1b881c3da6cd: Remove the login page and user table (authored by mprahl, committed by tflink). · Explain WhyOct 19 2016, 5:19 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 2640

View Options

.gitignore

1*.pyc 1​*.pyc
2*.pyo 2​*.pyo
3*.swp 3​*.swp
4*__pycache__* 4​*__pycache__*
5.ropeproject/ 5​.ropeproject/
6conf/settings.py 6​conf/settings.py
7*.sqlite 7​*.sqlite
8*.sass-cache 8​*.sass-cache
9*build/ 9​*build/
10*dist/ 10​*dist/
11*.egg* 11​*.egg*
12/env*/ 12​/env*/
13.coverage 13​.coverage
14htmlcov/ 14​htmlcov/
15.cache 15​.cache
16​.idea
View Options

alembic/versions/4dbe714897fe_remove_the_user_model.py

  • This file was added.
1​"""Remove the user model
2​
3​Revision ID: 4dbe714897fe
4​Revises: dbfab576c81
5​Create Date: 2016-10-17 15:52:14.061320
6​
7​"""
8​from alembic import op
9​import sqlalchemy as sa
10​
11​# revision identifiers, used by Alembic.
12​revision = '4dbe714897fe'
13​down_revision = 'dbfab576c81'
14​branch_labels = None
15​depends_on = None
16​
17​
18​def upgrade():
19​ op.drop_table('user')
20​
21​
22​def downgrade():
23​ op.create_table(
24​ 'user',
25​ sa.Column('id', sa.INTEGER(), nullable=False),
26​ sa.Column('username', sa.VARCHAR(length=80), nullable=True),
27​ sa.Column('pw_hash', sa.VARCHAR(length=120), nullable=True),
28​ sa.PrimaryKeyConstraint('id'),
29​ sa.UniqueConstraint('username')
30​ )
View Options

conf/resultsdb.conf

1WSGIDaemonProcess resultsdb user=apache group=apache threads=5 1​WSGIDaemonProcess resultsdb user=apache group=apache threads=5
2WSGIScriptAlias /resultsdb /usr/share/resultsdb/resultsdb.wsgi 2​WSGIScriptAlias /resultsdb /usr/share/resultsdb/resultsdb.wsgi
3WSGISocketPrefix run/wsgi 3​WSGISocketPrefix run/wsgi
4 4​
5# this isn't the best way to force SSL but it works for now ​
6#RewriteEngine On ​
7#RewriteCond %{HTTPS} !=on ​
8#RewriteRule ^/resultsdb/admin/?(.*) https://%{SERVER_NAME}/$1 [R,L] ​
9 ​
10<Directory /usr/share/resultsdb> 5​<Directory /usr/share/resultsdb>
11 WSGIProcessGroup resultsdb 6​ WSGIProcessGroup resultsdb
12 WSGIApplicationGroup %{GLOBAL} 7​ WSGIApplicationGroup %{GLOBAL}
13 WSGIScriptReloading On 8​ WSGIScriptReloading On
14 Order deny,allow 9​ Order deny,allow
15 Allow from all 10​ Allow from all
16</Directory> 11​</Directory>
17 12​
18#Alias /resultsdb/static /var/www/resultsdb/resultsdb/static 13​#Alias /resultsdb/static /var/www/resultsdb/resultsdb/static
19 14​
20#<Directory /var/www/resultsdb/resultsdb/static> 15​#<Directory /var/www/resultsdb/resultsdb/static>
21#Order allow,deny 16​#Order allow,deny
22#Allow from all 17​#Allow from all
23#</Directory> 18​#</Directory>
View Options

requirements.txt

Show All 9 Lines
10# you can define a dependency range here instead of an exact version. 10​# you can define a dependency range here instead of an exact version.
11 11​
12# This list is in the same order as the requirements in the specfile. 12​# This list is in the same order as the requirements in the specfile.
13 13​
14 14​
15fedmsg == 0.17.2 15​fedmsg == 0.17.2
16alembic == 0.8.3 16​alembic == 0.8.3
17Flask == 0.10.1 17​Flask == 0.10.1
18Flask-Login == 0.3.0 ​
19Flask-RESTful == 0.3.5 18​Flask-RESTful == 0.3.5
20Flask-SQLAlchemy == 2.1 19​Flask-SQLAlchemy == 2.1
21Flask-WTF == 0.10.0 ​
22iso8601 == 0.1.11 20​iso8601 == 0.1.11
23six == 1.10.0 21​six == 1.10.0
24SQLAlchemy == 1.0.13 22​SQLAlchemy == 1.0.13
25WTForms == 2.0 23​WTForms == 2.0
26 24​
27pytest >= 2.4.2 25​pytest >= 2.4.2
28pytest-cov >= 1.6 26​pytest-cov >= 1.6
View Options

resultsdb.spec

1Name: resultsdb 1​Name: resultsdb
2Version: 1.1.16 2​Version: 1.1.16
3Release: 3%{?dist} 3​Release: 3%{?dist}
4Summary: Results store for automated tasks 4​Summary: Results store for automated tasks
5 5​
6License: GPLv2+ 6​License: GPLv2+
7URL: https://bitbucket.org/fedoraqa/resultsdb 7​URL: https://bitbucket.org/fedoraqa/resultsdb
8Source0: https://qadevel.cloud.fedoraproject.org/releases/%{name}/%{name}-%{version}.tar.gz 8​Source0: https://qadevel.cloud.fedoraproject.org/releases/%{name}/%{name}-%{version}.tar.gz
9 9​
10BuildArch: noarch 10​BuildArch: noarch
11 11​
12Requires: fedmsg >= 0.16.2 12​Requires: fedmsg >= 0.16.2
13Requires: python-alembic >= 0.8.3 13​Requires: python-alembic >= 0.8.3
14Requires: python-flask >= 0.10.1 14​Requires: python-flask >= 0.10.1
15Requires: python-flask-login >= 0.2.11 ​
16Requires: python-flask-restful >= 0.2.11 15​Requires: python-flask-restful >= 0.2.11
17Requires: python-flask-sqlalchemy >= 2.0 16​Requires: python-flask-sqlalchemy >= 2.0
18Requires: python-flask-wtf >= 0.10.0 ​
19Requires: python-iso8601 >= 0.1.10 17​Requires: python-iso8601 >= 0.1.10
20Requires: python-six >= 1.9.0 18​Requires: python-six >= 1.9.0
21Requires: python-sqlalchemy >= 0.9.10 19​Requires: python-sqlalchemy >= 0.9.10
22Requires: python-wtforms >= 2.0 ​
23BuildRequires: fedmsg >= 0.16.2 20​BuildRequires: fedmsg >= 0.16.2
24BuildRequires: python-alembic >= 0.8.3 21​BuildRequires: python-alembic >= 0.8.3
25BuildRequires: python-flask >= 0.10.1 22​BuildRequires: python-flask >= 0.10.1
26BuildRequires: python-flask-login >= 0.2.11 ​
27BuildRequires: python-flask-restful >= 0.2.11 23​BuildRequires: python-flask-restful >= 0.2.11
28BuildRequires: python-flask-sqlalchemy >= 2.0 24​BuildRequires: python-flask-sqlalchemy >= 2.0
29BuildRequires: python-flask-wtf >= 0.10.0 ​
30BuildRequires: python-iso8601 >= 0.1.10 25​BuildRequires: python-iso8601 >= 0.1.10
31BuildRequires: pytest 26​BuildRequires: pytest
32BuildRequires: python2-devel 27​BuildRequires: python2-devel
33BuildRequires: python-setuptools 28​BuildRequires: python-setuptools
34 29​
35%description 30​%description
36ResultsDB is a results store engine for, but not limited to, Fedora QA tools. 31​ResultsDB is a results store engine for, but not limited to, Fedora QA tools.
37 32​
▲ Show 20 Lines • Show All 120 Lines • Show Last 20 Lines
View Options

resultsdb/__init__.py

Show All 16 Lines
17# Authors: 17​# Authors:
18# Josef Skladanka <jskladan@redhat.com> 18​# Josef Skladanka <jskladan@redhat.com>
19# Ralph Bean <rbean@redhat.com> 19​# Ralph Bean <rbean@redhat.com>
20 20​
21from resultsdb import proxy 21​from resultsdb import proxy
22 22​
23import flask 23​import flask
24from flask import Flask 24​from flask import Flask
25from flask.ext.login import LoginManager ​
26from flask.ext.sqlalchemy import SQLAlchemy 25​from flask.ext.sqlalchemy import SQLAlchemy
27 26​
28import logging 27​import logging
29import logging.handlers 28​import logging.handlers
30import os 29​import os
31 30​
32 31​
33# the version as used in setup.py 32​# the version as used in setup.py
▲ Show 20 Lines • Show All 93 Lines • ▼ Show 20 Line(s)
127 126​
128if app.config['SHOW_DB_URI']: 127​if app.config['SHOW_DB_URI']:
129 app.logger.debug('using DBURI: %s' % app.config['SQLALCHEMY_DATABASE_URI']) 128​ app.logger.debug('using DBURI: %s' % app.config['SQLALCHEMY_DATABASE_URI'])
130 129​
131 130​
132# database 131​# database
133db = SQLAlchemy(app) 132​db = SQLAlchemy(app)
134 133​
135# setup login manager ​
136login_manager = LoginManager() ​
137login_manager.setup_app(app) ​
138login_manager.login_view = 'login_page.login' ​
139 ​
140# register blueprints 134​# register blueprints
141from resultsdb.controllers.main import main 135​from resultsdb.controllers.main import main
142app.register_blueprint(main) 136​app.register_blueprint(main)
143 137​
144from resultsdb.controllers.login_page import login_page ​
145app.register_blueprint(login_page) ​
146 ​
147from resultsdb.controllers.admin import admin ​
148app.register_blueprint(admin) ​
149 ​
150from resultsdb.controllers.api_v1 import api as api_v1 138​from resultsdb.controllers.api_v1 import api as api_v1
151app.register_blueprint(api_v1, url_prefix="/api/v1.0") 139​app.register_blueprint(api_v1, url_prefix="/api/v1.0")
152 140​
153from resultsdb.controllers.api_v2 import api as api_v2 141​from resultsdb.controllers.api_v2 import api as api_v2
154app.register_blueprint(api_v2, url_prefix="/api/v2.0") 142​app.register_blueprint(api_v2, url_prefix="/api/v2.0")
View Options

resultsdb/cli.py

Show All 20 Lines
21import sys 21​import sys
22from optparse import OptionParser 22​from optparse import OptionParser
23 23​
24from alembic.config import Config 24​from alembic.config import Config
25from alembic import command as al_command 25​from alembic import command as al_command
26from alembic.migration import MigrationContext 26​from alembic.migration import MigrationContext
27 27​
28from resultsdb import db 28​from resultsdb import db
29from resultsdb.models.user import User ​
30from resultsdb.models.results import Group, Testcase, Result, ResultData 29​from resultsdb.models.results import Group, Testcase, Result, ResultData
31 30​
32from sqlalchemy.engine import reflection 31​from sqlalchemy.engine import reflection
33 32​
34def get_alembic_config(): 33​def get_alembic_config():
35 # the location of the alembic ini file and alembic scripts changes when 34​ # the location of the alembic ini file and alembic scripts changes when
36 # installed via package 35​ # installed via package
37 if os.path.exists("./alembic.ini"): 36​ if os.path.exists("./alembic.ini"):
▲ Show 20 Lines • Show All 55 Lines • ▼ Show 20 Line(s)66def initialize_db(destructive):
93 else: 92​ else:
94 print "WARN: You need to have your db stamped with an alembic revision" 93​ print "WARN: You need to have your db stamped with an alembic revision"
95 print " Run 'init_alembic' sub-command first." 94​ print " Run 'init_alembic' sub-command first."
96 95​
97 96​
98def mock_data(destructive): 97​def mock_data(destructive):
99 print "Populating tables with mock-data" 98​ print "Populating tables with mock-data"
100 99​
101 if destructive or not db.session.query(User).count(): ​
102 print " - User" ​
103 data_users = [('admin', 'admin'), ('user', 'user')] ​
104 ​
105 for d in data_users: ​
106 u = User(*d) ​
107 db.session.add(u) ​
108 ​
109 db.session.commit() ​
110 else: ​
111 print " - skipped User" ​
112 ​
113 if destructive or not db.session.query(Testcase).count(): 100​ if destructive or not db.session.query(Testcase).count():
114 print " - Testcase, Job, Result, ResultData" 101​ print " - Testcase, Job, Result, ResultData"
115 tc1 = Testcase(ref_url="http://example.com/depcheck", name="depcheck") 102​ tc1 = Testcase(ref_url="http://example.com/depcheck", name="depcheck")
116 tc2 = Testcase(ref_url="http://example.com/rpmlint", name="rpmlint") 103​ tc2 = Testcase(ref_url="http://example.com/rpmlint", name="rpmlint")
117 104​
118 j1 = Group(uuid='5b3f47b4-2ba2-11e5-a343-5254007dccf9', ref_url="http://example.com/job1") 105​ j1 = Group(uuid='5b3f47b4-2ba2-11e5-a343-5254007dccf9', ref_url="http://example.com/job1")
119 106​
120 j2 = Group(uuid='4e575b2c-2ba2-11e5-a343-5254007dccf9', ref_url="http://example.com/job2") 107​ j2 = Group(uuid='4e575b2c-2ba2-11e5-a343-5254007dccf9', ref_url="http://example.com/job2")
▲ Show 20 Lines • Show All 67 Lines • Show Last 20 Lines
View Options

resultsdb/controllers/admin.py

  • This file was deleted.
This file was completely deleted. Show File Contents
View Options

resultsdb/controllers/login_page.py

  • This file was deleted.
This file was completely deleted. Show File Contents
View Options

resultsdb/models/user.py

  • This file was deleted.
This file was completely deleted. Show File Contents
View Options

resultsdb/templates/admin/index.html

  • This file was deleted.
This file was completely deleted. Show File Contents
View Options

resultsdb/templates/login.html

  • This file was deleted.
This file was completely deleted. Show File Contents