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

Linter fixes for superuser API file

Browse source
This commit is contained in:
Joseph Schorr 2017-12-22 16:18:58 -05:00
parent ef42124085
commit 1d3a93efcb
1 changed files with 16 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
endpoints/api/superuser.py
View file

@ -1,36 +1,31 @@
""" Superuser API. """ """ Superuser API. """
import json
import logging import logging
import os import os
import string import string
import socket import socket
import pathvalidate
from datetime import datetime, timedelta from datetime import datetime, timedelta
from random import SystemRandom from random import SystemRandom
from dateutil.relativedelta import relativedelta import pathvalidate
from flask import request, make_response, jsonify from flask import request, make_response, jsonify
from tzlocal import get_localzone
import features import features
from app import (app, avatar, superusers, authentication, config_provider, license_validator, from app import app, avatar, superusers, authentication, config_provider, license_validator
all_queues, log_archive, build_logs)
from auth import scopes from auth import scopes
from auth.auth_context import get_authenticated_user from auth.auth_context import get_authenticated_user
from auth.permissions import SuperUserPermission from auth.permissions import SuperUserPermission
from data.buildlogs import BuildStatusRetrievalError from data.database import ServiceKeyApprovalType
from endpoints.api import (ApiResource, nickname, resource, validate_json_request, from endpoints.api import (ApiResource, nickname, resource, validate_json_request,
internal_only, require_scope, show_if, parse_args, internal_only, require_scope, show_if, parse_args,
query_param, abort, require_fresh_login, path_param, verify_not_prod, query_param, abort, require_fresh_login, path_param, verify_not_prod,
page_support, log_action, InvalidRequest, format_date) page_support, log_action, InvalidRequest, format_date)
from endpoints.api.build import build_status_view, get_logs_or_log_url from endpoints.api.build import get_logs_or_log_url
from data import model, database from endpoints.api.superuser_models_pre_oci import (pre_oci_model, ServiceKeyDoesNotExist,
from data.database import ServiceKeyApprovalType ServiceKeyAlreadyApproved,
from endpoints.api.superuser_models_pre_oci import pre_oci_model, ServiceKeyDoesNotExist, ServiceKeyAlreadyApproved, \ InvalidRepositoryBuildException)
InvalidRepositoryBuildException
from endpoints.exception import NotFound, InvalidResponse from endpoints.exception import NotFound, InvalidResponse
from util.useremails import send_confirmation_email, send_recovery_email from util.useremails import send_confirmation_email, send_recovery_email
from util.license import decode_license, LicenseDecodeError from util.license import decode_license, LicenseDecodeError
@ -142,7 +137,8 @@ class SuperUserAggregateLogs(ApiResource):
def get(self, parsed_args): def get(self, parsed_args):
""" Returns the aggregated logs for the current system. """ """ Returns the aggregated logs for the current system. """
if SuperUserPermission().can(): if SuperUserPermission().can():
(start_time, end_time) = _validate_logs_arguments(parsed_args['starttime'], parsed_args['endtime']) (start_time, end_time) = _validate_logs_arguments(parsed_args['starttime'],
parsed_args['endtime'])
aggregated_logs = pre_oci_model.get_aggregated_logs(start_time, end_time) aggregated_logs = pre_oci_model.get_aggregated_logs(start_time, end_time)
return { return {
@ -151,10 +147,8 @@ class SuperUserAggregateLogs(ApiResource):
abort(403) abort(403)
LOGS_PER_PAGE = 20 LOGS_PER_PAGE = 20
@resource('/v1/superuser/logs') @resource('/v1/superuser/logs')
@internal_only @internal_only
@show_if(features.SUPER_USERS) @show_if(features.SUPER_USERS)
@ -179,10 +173,10 @@ class SuperUserLogs(ApiResource):
log_page = pre_oci_model.get_logs_query(start_time, end_time, page_token=page_token) log_page = pre_oci_model.get_logs_query(start_time, end_time, page_token=page_token)
return { return {
'start_time': format_date(start_time), 'start_time': format_date(start_time),
'end_time': format_date(end_time), 'end_time': format_date(end_time),
'logs': [log.to_dict() for log in log_page.logs], 'logs': [log.to_dict() for log in log_page.logs],
}, log_page.next_page_token }, log_page.next_page_token
abort(403) abort(403)
@ -469,7 +463,8 @@ class SuperUserManagement(ApiResource):
return_value = user.to_dict() return_value = user.to_dict()
if user_data.get('password') is not None: if user_data.get('password') is not None:
return_value['encrypted_password'] = authentication.encrypt_user_password(user_data.get('password')) password = user_data.get('password')
return_value['encrypted_password'] = authentication.encrypt_user_password(password)
return return_value return return_value