vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Have all error pages be rendered by Angular

Browse source 
Fixes #2198

Fixes https://www.pivotaltracker.com/story/show/135724483
This commit is contained in:
Joseph Schorr 2016-12-07 17:13:17 -05:00
parent 0aa6e6cd58
commit c06bba38de
13 changed files with 78 additions and 116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
data/model/user.py
View file

@ -440,7 +440,7 @@ def confirm_user_email(code):
code = EmailConfirmation.get(EmailConfirmation.code == code,
EmailConfirmation.email_confirm == True)
except EmailConfirmation.DoesNotExist:
raise DataModelException('Invalid email confirmation code.')
raise DataModelException('Invalid email confirmation code')
user = code.user
user.verified = True
@ -449,7 +449,7 @@ def confirm_user_email(code):
new_email = code.new_email
if new_email and new_email != old_email:
if find_user_by_email(new_email):
raise DataModelException('E-mail address already used.')
raise DataModelException('E-mail address already used')
old_email = user.email
user.email = new_email
@ -465,10 +465,10 @@ def create_reset_password_email_code(email):
try:
user = User.get(User.email == email)
except User.DoesNotExist:
raise InvalidEmailAddressException('Email address was not found.')
raise InvalidEmailAddressException('Email address was not found')
if user.organization:
raise InvalidEmailAddressException('Organizations can not have passwords.')
raise InvalidEmailAddressException('Organizations can not have passwords')
code = EmailConfirmation.create(user=user, pw_reset=True)
return code

12
endpoints/common.py
View file

@ -205,18 +205,18 @@ def render_page_template(name, route_data=None, **kwargs):
version_number = ' - ' + _get_version_number()
resp = make_response(render_template(name,
route_data=json.dumps(route_data),
route_data=route_data,
external_styles=external_styles,
external_scripts=external_scripts,
main_styles=add_cachebusters(main_styles),
library_styles=add_cachebusters(library_styles),
main_scripts=add_cachebusters(main_scripts),
library_scripts=add_cachebusters(library_scripts),
feature_set=json.dumps(features.get_features()),
config_set=json.dumps(frontend_visible_config(app.config)),
oauth_set=json.dumps(get_oauth_config()),
scope_set=json.dumps(scopes.app_scopes(app.config)),
vuln_priority_set=json.dumps(PRIORITY_LEVELS),
feature_set=features.get_features(),
config_set=frontend_visible_config(app.config),
oauth_set=get_oauth_config(),
scope_set=scopes.app_scopes(app.config),
vuln_priority_set=PRIORITY_LEVELS,
enterprise_logo=app.config.get('ENTERPRISE_LOGO_URL', ''),
mixpanel_key=app.config.get('MIXPANEL_KEY', ''),
munchkin_key=app.config.get('MARKETO_MUNCHKIN_ID', ''),

24
endpoints/oauthlogin.py
View file

@ -11,7 +11,7 @@ from app import app, analytics, get_app_url, github_login, google_login, dex_log
from auth.process import require_session_login
from data import model
from endpoints.common import common_login, route_show_if
from endpoints.web import render_page_template_with_routedata
from endpoints.web import index
from util.security.jwtutil import decode, InvalidTokenError
from util.validation import generate_valid_usernames
@ -20,15 +20,17 @@ client = app.config['HTTPCLIENT']
oauthlogin = Blueprint('oauthlogin', __name__)
def render_ologin_error(service_name,
error_message='Could not load user data. The token may have expired.'):
user_creation = features.USER_CREATION and features.DIRECT_LOGIN
return render_page_template_with_routedata('ologinerror.html',
service_name=service_name,
error_message=error_message,
service_url=get_app_url(),
user_creation=user_creation)
def render_ologin_error(service_name, error_message=None, register_redirect=False):
user_creation = bool(features.USER_CREATION and features.DIRECT_LOGIN)
error_info = {
'reason': 'ologinerror',
'service_name': service_name,
'error_message': error_message or 'Could not load user data. The token may have expired',
'service_url': get_app_url(),
'user_creation': user_creation,
'register_redirect': register_redirect,
}
return index('', error_info=error_info)
def get_user(service, token):
token_param = {
@ -81,7 +83,7 @@ def conduct_oauth_login(service, user_id, username, email, metadata={}):
message = message + "\nPlease log in with your username and password and "
message = message + "associate your %s account to use it in the future." % (service_name, )
return render_ologin_error(service_name, message)
return render_ologin_error(service_name, message, register_redirect=True)
except model.DataModelException as ex:
return render_ologin_error(service_name, ex.message)

13
endpoints/web.py
View file

@ -67,7 +67,7 @@ def internal_error_display():
@web.errorhandler(404)
@web.route('/404', methods=['GET'])
def not_found_error_display(e = None):
resp = index('', error_code=404)
resp = index('', error_code=404, error_info=dict(reason='notfound'))
resp.status_code = 404
return resp
@ -275,12 +275,6 @@ def dbrevision_health():
return response
@web.route('/disclaimer', methods=['GET'])
@no_cache
def disclaimer():
return render_page_template_with_routedata('disclaimer.html')
@web.route('/robots.txt', methods=['GET'])
def robots():
robots_txt = make_response(render_template('robots.txt', baseurl=get_app_url()))
@ -367,7 +361,7 @@ def confirm_repo_email():
try:
record = model.repository.confirm_email_authorization_for_repo(code)
except model.DataModelException as ex:
return render_page_template_with_routedata('confirmerror.html', error_message=ex.message)
return index('', error_info=dict(reason='confirmerror', error_message=ex.message))
message = """
Your E-mail address has been authorized to receive notifications for repository
@ -390,7 +384,7 @@ def confirm_email():
try:
user, new_email, old_email = model.user.confirm_user_email(code)
except model.DataModelException as ex:
return render_page_template_with_routedata('confirmerror.html', error_message=ex.message)
return index('', error_info=dict(reason='confirmerror', error_message=ex.message))
if new_email:
send_email_changed(user.username, old_email, new_email)
@ -706,6 +700,7 @@ def redirect_to_repository(namespace_name, repo_name, tag_name):
# - If the repository does exist (no access), 403
# > If the user is not a member of the namespace: 403
error_info = {
'reason': 'notfound',
'for_repo': True,
'namespace_exists': namespace_exists,
'namespace': namespace_name,

5
static/css/pages/error-view.css
View file

@ -23,3 +23,8 @@
width: 225px;
height: 205px;
}
.error-view-element h2 .fa-exclamation-triangle {
margin-right: 16px;
color: #D64456;
}

3
static/js/app.js
View file

@ -214,7 +214,8 @@ quayApp.config(['$routeProvider', '$locationProvider', 'pages', function($routeP
// 404/403
.route('/:catchall', 'error-view')
.route('/:catch/:all', 'error-view');
.route('/:catch/:all', 'error-view')
.route('/:catch/:all/:things', 'error-view');
}]);
// Configure compile provider to add additional URL prefixes to the sanitization list. We use

4
static/js/pages/error-view.js
View file

@ -4,13 +4,13 @@
*/
angular.module('quayPages').config(['pages', function(pages) {
pages.create('error-view', 'error-view.html', ErrorViewCtrl, {
'title': '{{code}}',
'title': '{{info.error_message || "Error"}}',
'description': 'Error',
'newLayout': false
});
}]);
function ErrorViewCtrl($scope, ApiService, $routeParams, UserService) {
function ErrorViewCtrl($scope, ApiService, $routeParams, $rootScope, UserService) {
$scope.info = window.__error_info;
$scope.code = window.__error_code || 404;
}

25
static/partials/error-view.html
View file

@ -1,4 +1,26 @@
<div class="error-view-element">
<div ng-switch on="info.reason">
<!-- Confirmation error -->
<div ng-switch-when="confirmerror">
<h2><i class="fa fa-exclamation-triangle"></i> Confirmation Error</h2>
<h3>{{ info.error_message || 'There was an error confirming your e-mail address' }}</h3>
<div>
If you've received this error after trying to recover your account, please perform the recovery process again.
</div>
</div>
<!-- OAuth login error -->
<div ng-switch-when="ologinerror">
<h2><i class="fa fa-exclamation-triangle"></i>{{ info.service_name }} login error</h2>
<h3 ng-if="info.error_message">{{ info.error_message }}</h3>
<div ng-if="info.user_creation && info.register_redirect">
To continue, please register using the <a href="/signin">registration form</a>.
You will be able to reassociate this {{ info.service_name }} account to your new Quay account in the user settings panel.
</div>
</div>
<!-- Otherwise -->
<div ng-switch-default>
<!-- 404 -->
<div class="err404" ng-if="code == 404">
<h2>404: Not Found</h2>
@ -30,4 +52,7 @@
<h4 ng-if="info.for_repo">Contact the admin of the <strong>{{ info.namespace }}</strong> namespace for access to the repository or you can return to the <a href="/">main page</a></h4>
<h4 ng-if="!info.for_repo">Return to the <a href="/">main page</a></h4>
</div>
</div>
</div>
</div>

16
templates/base.html
View file

@ -1,6 +1,8 @@
<!DOCTYPE html>
<html ng-app="quay">
<head>
<base href="/">
{% block title %}
{% endblock %}
@ -33,12 +35,12 @@
{% endblock %}
<script type="text/javascript">
window.__endpoints = {{ route_data|safe }}.paths;
window.__features = {{ feature_set|safe }};
window.__config = {{ config_set|safe }};
window.__oauth = {{ oauth_set|safe }};
window.__auth_scopes = {{ scope_set|safe }};
window.__vuln_priority = {{ vuln_priority_set|safe }}
window.__endpoints = {{ route_data|tojson|safe }}.paths;
window.__features = {{ feature_set|tojson|safe }};
window.__config = {{ config_set|tojson|safe }};
window.__oauth = {{ oauth_set|tojson|safe }};
window.__auth_scopes = {{ scope_set|tojson|safe }};
window.__vuln_priority = {{ vuln_priority_set|tojson|safe }}
window.__token = '{{ csrf_token() }}';
{% if error_code %}
@ -46,7 +48,7 @@
{% endif %}
{% if error_info %}
window.__error_info = {{ error_info|safe }};
window.__error_info = {{ error_info|tojson|safe }};
{% endif %}
</script>

20
templates/confirmerror.html
View file

@ -1,20 +0,0 @@
{% extends "base.html" %}
{% block title %}
<title>Confirmation error · Quay</title>
{% endblock %}
{% block body_content %}
<div class="container">
<div class="row">
<div class="col-md-12">
<h2>There was an error confirming your e-mail address.</h2>
{% if error_message %}
<div class="alert alert-danger">{{ error_message }}</div>
{% endif %}
</div>
</div>
</div>
{% endblock %}

16
templates/disclaimer.html
View file

@ -1,16 +0,0 @@
{% extends "base.html" %}
{% block title %}
<title>Docker Trademark Disclaimer · Quay</title>
{% endblock %}
{% block body_content %}
<div class="container">
<div class="row">
<div class="col-md-12">
Quay is in no way affiliated with or sponsored by Docker, Inc. Docker, Docker logo and dotCloud are trademarks or registered trademarks of Docker, Inc. in the United States and/or other countries. Docker, Inc. and other parties may also have trademark rights in other terms used herein.
</div>
</div>
</div>
{% endblock %}

4
templates/oauthorize.html
View file

@ -1,9 +1,5 @@
{% extends "base.html" %}
{% block added_meta %}
<base href="/">
{% endblock %}
{% block title %}
<title>Authorize {{ application.name }} · Quay</title>
{% endblock %}

28
templates/ologinerror.html
View file

@ -1,28 +0,0 @@
{% extends "base.html" %}
{% block title %}
<title>Error Logging in with {{ service_name }} · Quay</title>
{% endblock %}
{% block body_content %}
<div class="container">
<div class="row">
<div class="col-md-12">
<h2 style="margin-bottom: 20px;">There was an error logging in with {{ service_name }}.</h2>
{% if error_message %}
<div class="co-alert co-alert-danger">{{ error_message }}</div>
{% endif %}
{% if user_creation %}
<div>
Please register using the <a ng-href="{{ service_url }}/signin" target="_self">registration form</a> to continue.
You will be able to connect your account to your Quay account
in the user settings.
</div>
{% endif %}
</div>
</div>
</div>
{% endblock %}