Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Add token verification" #512

Merged
merged 1 commit into from
Jan 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions trailblazer/containers.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@
from trailblazer.services.slurm.slurm_api_service.slurm_api_service import SlurmAPIService
from trailblazer.services.slurm.slurm_cli_service.slurm_cli_service import SlurmCLIService
from trailblazer.services.tower.tower_api_service import TowerAPIService
from trailblazer.services.user_verification_service.user_verification_service import (
UserVerificationService,
)
from trailblazer.store.store import Store


Expand Down Expand Up @@ -81,12 +78,6 @@ class Container(containers.DeclarativeContainer):

encryption_service = providers.Singleton(EncryptionService, secret_key=encryption_key)

user_verification_service = providers.Singleton(
UserVerificationService,
store=store,
google_client_id=oauth_client_id,
google_api_base_url=google_api_base_url,
)
auth_service = providers.Singleton(
AuthenticationService,
google_oauth_client=google_oauth_client,
Expand Down
25 changes: 11 additions & 14 deletions trailblazer/server/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,33 +32,30 @@
from trailblazer.services.analysis_service.analysis_service import AnalysisService
from trailblazer.services.authentication_service.authentication_service import AuthenticationService
from trailblazer.services.job_service import JobService
from trailblazer.services.user_verification_service.exc import UserTokenVerificationError
from trailblazer.services.user_verification_service.user_verification_service import (
UserVerificationService,
)
from trailblazer.store.models import Info, User

blueprint = Blueprint("api", __name__, url_prefix="/api/v1")


@blueprint.before_request
@inject
def before_request(
user_verification_service: UserVerificationService = Provide[
Container.user_verification_service
],
):
def before_request():
"""Authentication that is run before processing requests to the application"""
if request.endpoint == "api.authenticate":
return
if request.method == "OPTIONS":
return make_response(jsonify(ok=True), 204)
if os.environ.get("SCOPE") == "DEVELOPMENT":
return
try:
g.current_user = user_verification_service.verify_user(request.headers.get("Authorization"))
except (UserTokenVerificationError, ValueError) as error:
abort(HTTPStatus.UNAUTHORIZED, str(error))
if auth_header := request.headers.get("Authorization"):
jwt_token = auth_header.split("Bearer ")[-1]
else:
return abort(403, "no JWT token found on request")

user_data: Mapping = jwt.decode(jwt_token, verify=False)
if user := store.get_user(email=user_data["email"], exclude_archived=True):
g.current_user = user
else:
return abort(403, f"{user_data['email']} doesn't have access")


@blueprint.route("/auth", methods=["POST"])
Expand Down
9 changes: 0 additions & 9 deletions trailblazer/services/user_verification_service/exc.py

This file was deleted.

This file was deleted.

Loading