From 31b77cf2322efd1d8b9dfd0d7bb7157d476c3a83 Mon Sep 17 00:00:00 2001 From: Jimmy Zelinskie Date: Thu, 29 Sep 2016 15:24:57 -0400 Subject: [PATCH] rename auth.auth to auth.process This fixes some ambiguity around imports. --- auth/{auth.py => process.py} | 0 endpoints/api/__init__.py | 2 +- endpoints/bitbuckettrigger.py | 2 +- endpoints/githubtrigger.py | 2 +- endpoints/gitlabtrigger.py | 2 +- endpoints/oauthlogin.py | 2 +- endpoints/realtime.py | 2 +- endpoints/v1/index.py | 2 +- endpoints/v1/registry.py | 2 +- endpoints/v1/tag.py | 2 +- endpoints/v2/v2auth.py | 2 +- endpoints/verbs/__init__.py | 2 +- endpoints/web.py | 4 ++-- endpoints/webhooks.py | 2 +- test/test_auth.py | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) rename auth/{auth.py => process.py} (100%) diff --git a/auth/auth.py b/auth/process.py similarity index 100% rename from auth/auth.py rename to auth/process.py diff --git a/endpoints/api/__init__.py b/endpoints/api/__init__.py index e93301f55..8600eb204 100644 --- a/endpoints/api/__init__.py +++ b/endpoints/api/__init__.py @@ -19,7 +19,7 @@ from auth.permissions import (ReadRepositoryPermission, ModifyRepositoryPermissi UserAdminPermission) from auth import scopes from auth.auth_context import get_authenticated_user, get_validated_oauth_token -from auth.auth import process_oauth +from auth.process import process_oauth from endpoints.csrf import csrf_protect from endpoints.exception import (ApiException, Unauthorized, InvalidRequest, InvalidResponse, FreshLoginRequired) diff --git a/endpoints/bitbuckettrigger.py b/endpoints/bitbuckettrigger.py index f0111b0f6..8c8052235 100644 --- a/endpoints/bitbuckettrigger.py +++ b/endpoints/bitbuckettrigger.py @@ -4,7 +4,7 @@ from flask import request, redirect, url_for, Blueprint from flask_login import current_user from app import app -from auth.auth import require_session_login +from auth.process import require_session_login from buildtrigger.basehandler import BuildTriggerHandler from buildtrigger.bitbuckethandler import BitbucketBuildTrigger from data import model diff --git a/endpoints/githubtrigger.py b/endpoints/githubtrigger.py index dbd75c27d..1f0d9ca90 100644 --- a/endpoints/githubtrigger.py +++ b/endpoints/githubtrigger.py @@ -6,8 +6,8 @@ from flask_login import current_user import features from app import app, github_trigger -from auth.auth import require_session_login from auth.permissions import AdministerRepositoryPermission +from auth.process import require_session_login from data import model from endpoints.common import route_show_if, parse_repository_name from util.http import abort diff --git a/endpoints/gitlabtrigger.py b/endpoints/gitlabtrigger.py index 32499ca52..4f51a2bdc 100644 --- a/endpoints/gitlabtrigger.py +++ b/endpoints/gitlabtrigger.py @@ -6,8 +6,8 @@ from flask_login import current_user import features from app import app, gitlab_trigger -from auth.auth import require_session_login from auth.permissions import AdministerRepositoryPermission +from auth.process import require_session_login from data import model from endpoints.common import route_show_if from util.http import abort diff --git a/endpoints/oauthlogin.py b/endpoints/oauthlogin.py index 23e5ed3e9..749baeb20 100644 --- a/endpoints/oauthlogin.py +++ b/endpoints/oauthlogin.py @@ -9,7 +9,7 @@ from peewee import IntegrityError import features from app import app, analytics, get_app_url, github_login, google_login, dex_login -from auth.auth import require_session_login +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 diff --git a/endpoints/realtime.py b/endpoints/realtime.py index 38a53c327..cc113da0c 100644 --- a/endpoints/realtime.py +++ b/endpoints/realtime.py @@ -5,7 +5,7 @@ from flask import request, Blueprint, abort, Response from flask_login import current_user from app import userevents -from auth.auth import require_session_login +from auth.process import require_session_login from data.userevent import CannotReadUserEventsException diff --git a/endpoints/v1/index.py b/endpoints/v1/index.py index 454b95c78..16f94d8f9 100644 --- a/endpoints/v1/index.py +++ b/endpoints/v1/index.py @@ -8,11 +8,11 @@ from flask import request, make_response, jsonify, session from data.interfaces.v1 import pre_oci_model as model from app import authentication, userevents, metric_queue -from auth.auth import process_auth, generate_signed_token from auth.auth_context import get_authenticated_user, get_validated_token, get_validated_oauth_token from auth.permissions import (ModifyRepositoryPermission, UserAdminPermission, ReadRepositoryPermission, CreateRepositoryPermission, repository_read_grant, repository_write_grant) +from auth.process import process_auth, generate_signed_token from util.http import abort from util.names import REPOSITORY_NAME_REGEX from endpoints.common import parse_repository_name diff --git a/endpoints/v1/registry.py b/endpoints/v1/registry.py index 2e9a92c09..9deb113b1 100644 --- a/endpoints/v1/registry.py +++ b/endpoints/v1/registry.py @@ -8,10 +8,10 @@ from time import time from flask import make_response, request, session, Response, redirect, abort as flask_abort from app import storage as store, app -from auth.auth import process_auth, extract_namespace_repo_from_session from auth.auth_context import get_authenticated_user from auth.permissions import (ReadRepositoryPermission, ModifyRepositoryPermission) +from auth.process import process_auth, extract_namespace_repo_from_session from auth.registry_jwt_auth import get_granted_username from data import model, database from data.interfaces.v1 import pre_oci_model as model diff --git a/endpoints/v1/tag.py b/endpoints/v1/tag.py index 973464683..917cc6a6f 100644 --- a/endpoints/v1/tag.py +++ b/endpoints/v1/tag.py @@ -5,9 +5,9 @@ from flask import abort, request, jsonify, make_response, session from util.names import TAG_ERROR, TAG_REGEX -from auth.auth import process_auth from auth.permissions import (ReadRepositoryPermission, ModifyRepositoryPermission) +from auth.process import process_auth from data import model from data.interfaces.v1 import pre_oci_model as model from endpoints.common import parse_repository_name diff --git a/endpoints/v2/v2auth.py b/endpoints/v2/v2auth.py index 83445fd81..60d419662 100644 --- a/endpoints/v2/v2auth.py +++ b/endpoints/v2/v2auth.py @@ -5,10 +5,10 @@ from cachetools import lru_cache from flask import request, jsonify, abort from app import app, userevents, instance_keys -from auth.auth import process_auth from auth.auth_context import get_authenticated_user, get_validated_token, get_validated_oauth_token from auth.permissions import (ModifyRepositoryPermission, ReadRepositoryPermission, CreateRepositoryPermission) +from auth.process import process_auth from endpoints.v2 import v2_bp from endpoints.decorators import anon_protect from data.interfaces.v2 import pre_oci_model as model diff --git a/endpoints/verbs/__init__.py b/endpoints/verbs/__init__.py index fadf63bbc..7dddd0a8c 100644 --- a/endpoints/verbs/__init__.py +++ b/endpoints/verbs/__init__.py @@ -6,9 +6,9 @@ from flask import redirect, Blueprint, abort, send_file, make_response, request import features from app import app, signer, storage, metric_queue -from auth.auth import process_auth from auth.auth_context import get_authenticated_user from auth.permissions import ReadRepositoryPermission +from auth.process import process_auth from data import database from data.interfaces.verbs import pre_oci_model as model from endpoints.common import route_show_if, parse_repository_name diff --git a/endpoints/web.py b/endpoints/web.py index 7b0b477e3..4b4d9f4e1 100644 --- a/endpoints/web.py +++ b/endpoints/web.py @@ -13,11 +13,11 @@ import features from app import (app, billing as stripe, build_logs, avatar, signer, log_archive, config_provider, get_app_url, instance_keys) from auth import scopes -from auth.auth import require_session_login, process_oauth, has_basic_auth, process_auth_or_cookie +from auth.auth_context import get_authenticated_user from auth.permissions import (AdministerOrganizationPermission, ReadRepositoryPermission, SuperUserPermission, AdministerRepositoryPermission, ModifyRepositoryPermission, OrganizationMemberPermission) -from auth.auth_context import get_authenticated_user +from auth.process import require_session_login, process_oauth, has_basic_auth, process_auth_or_cookie from buildtrigger.basehandler import BuildTriggerHandler from buildtrigger.bitbuckethandler import BitbucketBuildTrigger from buildtrigger.customhandler import CustomBuildTrigger diff --git a/endpoints/webhooks.py b/endpoints/webhooks.py index abe43280c..a65036705 100644 --- a/endpoints/webhooks.py +++ b/endpoints/webhooks.py @@ -4,8 +4,8 @@ from flask import request, make_response, Blueprint from app import billing as stripe from data import model -from auth.auth import process_auth from auth.permissions import ModifyRepositoryPermission +from auth.process import process_auth from util.invoice import renderInvoiceToHtml from util.useremails import send_invoice_email, send_subscription_change, send_payment_failed from util.http import abort diff --git a/test/test_auth.py b/test/test_auth.py index 3136cc7a4..c5112ebf4 100644 --- a/test/test_auth.py +++ b/test/test_auth.py @@ -7,10 +7,10 @@ from flask import g from flask_principal import identity_loaded from app import app -from auth.auth import _process_basic_auth from auth.scopes import (scopes_from_scope_string, is_subset_string, DIRECT_LOGIN, ADMIN_REPO, ALL_SCOPES) from auth.permissions import QuayDeferredPermissionUser +from auth.process import _process_basic_auth from data import model from data.database import OAuthApplication, OAuthAccessToken from endpoints.api import api