diff --git a/docs/ahriman-architecture.svg b/docs/ahriman-architecture.svg index bd2f0573..f59faef2 100644 --- a/docs/ahriman-architecture.svg +++ b/docs/ahriman-architecture.svg @@ -4,3587 +4,3669 @@ - + G - + ahriman_application_ahriman - -ahriman. -application. -ahriman + +ahriman. +application. +ahriman ahriman_application_application - -ahriman. -application. -application + +ahriman. +application. +application ahriman_application_handlers_add - -ahriman. -application. -handlers. -add + +ahriman. +application. +handlers. +add ahriman_application_application->ahriman_application_handlers_add - - + + ahriman_application_handlers_clean - -ahriman. -application. -handlers. -clean + +ahriman. +application. +handlers. +clean ahriman_application_application->ahriman_application_handlers_clean - - - + + ahriman_application_handlers_init - -ahriman. -application. -handlers. -init + +ahriman. +application. +handlers. +init ahriman_application_application->ahriman_application_handlers_init - - + + ahriman_application_handlers_key_import - -ahriman. -application. -handlers. -key_import + +ahriman. +application. +handlers. +key_import ahriman_application_application->ahriman_application_handlers_key_import - - + + ahriman_application_handlers_rebuild - -ahriman. -application. -handlers. -rebuild + +ahriman. +application. +handlers. +rebuild ahriman_application_application->ahriman_application_handlers_rebuild - - - + + + ahriman_application_handlers_remove - -ahriman. -application. -handlers. -remove + +ahriman. +application. +handlers. +remove ahriman_application_application->ahriman_application_handlers_remove - - + + ahriman_application_handlers_remove_unknown - -ahriman. -application. -handlers. -remove_unknown + +ahriman. +application. +handlers. +remove_unknown ahriman_application_application->ahriman_application_handlers_remove_unknown - - + + ahriman_application_handlers_report - -ahriman. -application. -handlers. -report + +ahriman. +application. +handlers. +report ahriman_application_application->ahriman_application_handlers_report - - - + + ahriman_application_handlers_setup - -ahriman. -application. -handlers. -setup + +ahriman. +application. +handlers. +setup ahriman_application_application->ahriman_application_handlers_setup - - - + + + ahriman_application_handlers_sign - -ahriman. -application. -handlers. -sign + +ahriman. +application. +handlers. +sign ahriman_application_application->ahriman_application_handlers_sign - - + + ahriman_application_handlers_status - -ahriman. -application. -handlers. -status + +ahriman. +application. +handlers. +status ahriman_application_application->ahriman_application_handlers_status - - + + ahriman_application_handlers_status_update - -ahriman. -application. -handlers. -status_update + +ahriman. +application. +handlers. +status_update ahriman_application_application->ahriman_application_handlers_status_update - - + + ahriman_application_handlers_sync - -ahriman. -application. -handlers. -sync + +ahriman. +application. +handlers. +sync ahriman_application_application->ahriman_application_handlers_sync - + + ahriman_application_handlers_update - -ahriman. -application. -handlers. -update + +ahriman. +application. +handlers. +update ahriman_application_application->ahriman_application_handlers_update - + + + ahriman_application_handlers_user - -ahriman. -application. -handlers. -user + +ahriman. +application. +handlers. +user ahriman_application_application->ahriman_application_handlers_user - - + + ahriman_application_handlers - -ahriman. -application. -handlers + +ahriman. +application. +handlers ahriman_application_handlers->ahriman_application_ahriman - - + + ahriman_application_handlers_add->ahriman_application_handlers - + ahriman_application_handlers_clean->ahriman_application_handlers - + ahriman_application_handlers_dump - -ahriman. -application. -handlers. -dump + +ahriman. +application. +handlers. +dump ahriman_application_handlers_dump->ahriman_application_handlers - + ahriman_application_handlers_handler - -ahriman. -application. -handlers. -handler + +ahriman. +application. +handlers. +handler ahriman_application_handlers_handler->ahriman_application_handlers - - + + ahriman_application_handlers_handler->ahriman_application_handlers_add - - + + ahriman_application_handlers_handler->ahriman_application_handlers_clean - - + + ahriman_application_handlers_handler->ahriman_application_handlers_dump - - + + ahriman_application_handlers_handler->ahriman_application_handlers_init - - + + ahriman_application_handlers_handler->ahriman_application_handlers_key_import - - + + ahriman_application_handlers_handler->ahriman_application_handlers_rebuild - - + + ahriman_application_handlers_handler->ahriman_application_handlers_remove - - + + ahriman_application_handlers_handler->ahriman_application_handlers_remove_unknown - - + + ahriman_application_handlers_handler->ahriman_application_handlers_report - - + + ahriman_application_handlers_search - -ahriman. -application. -handlers. -search + +ahriman. +application. +handlers. +search ahriman_application_handlers_handler->ahriman_application_handlers_search - - + + ahriman_application_handlers_handler->ahriman_application_handlers_setup - - + + ahriman_application_handlers_handler->ahriman_application_handlers_sign - - + + ahriman_application_handlers_handler->ahriman_application_handlers_status - - + + ahriman_application_handlers_handler->ahriman_application_handlers_status_update - - + + ahriman_application_handlers_handler->ahriman_application_handlers_sync - - + + ahriman_application_handlers_handler->ahriman_application_handlers_update - - + + ahriman_application_handlers_handler->ahriman_application_handlers_user - - + + ahriman_application_handlers_web - -ahriman. -application. -handlers. -web + +ahriman. +application. +handlers. +web ahriman_application_handlers_handler->ahriman_application_handlers_web - - + + ahriman_application_handlers_init->ahriman_application_handlers - + ahriman_application_handlers_key_import->ahriman_application_handlers - + ahriman_application_handlers_rebuild->ahriman_application_handlers - + ahriman_application_handlers_remove->ahriman_application_handlers - - - - + ahriman_application_handlers_remove_unknown->ahriman_application_handlers - + ahriman_application_handlers_report->ahriman_application_handlers - + ahriman_application_handlers_search->ahriman_application_handlers - - + ahriman_application_handlers_setup->ahriman_application_handlers - + + ahriman_application_handlers_sign->ahriman_application_handlers - + ahriman_application_handlers_status->ahriman_application_handlers - + ahriman_application_handlers_status_update->ahriman_application_handlers - + + + ahriman_application_handlers_sync->ahriman_application_handlers - + ahriman_application_handlers_update->ahriman_application_handlers - + + + + + + ahriman_application_handlers_user->ahriman_application_handlers - + ahriman_application_handlers_web->ahriman_application_handlers - - + + ahriman_application_lock - -ahriman. -application. -lock + +ahriman. +application. +lock ahriman_application_lock->ahriman_application_handlers_handler - + + ahriman_core - -ahriman.core + +ahriman.core ahriman_core->ahriman_application_application - - - - + + + + + ahriman_core->ahriman_application_handlers_add - - - + + + + ahriman_core->ahriman_application_handlers_clean - - + + + ahriman_core->ahriman_application_handlers_dump - - + + + ahriman_core->ahriman_application_handlers_handler - + + + + ahriman_core->ahriman_application_handlers_init - + + ahriman_core->ahriman_application_handlers_key_import - - - - + ahriman_core->ahriman_application_handlers_rebuild - + + ahriman_core->ahriman_application_handlers_remove - + + ahriman_core->ahriman_application_handlers_remove_unknown - - - - + + + ahriman_core->ahriman_application_handlers_report - - + + + ahriman_core->ahriman_application_handlers_search - - - - + + ahriman_core->ahriman_application_handlers_setup - - - + + ahriman_core->ahriman_application_handlers_sign - - + + + ahriman_core->ahriman_application_handlers_status - - + + ahriman_core->ahriman_application_handlers_status_update - - + + ahriman_core->ahriman_application_handlers_sync - - - - - + ahriman_core->ahriman_application_handlers_update - - - + ahriman_core->ahriman_application_handlers_user - - - - + + + + ahriman_core->ahriman_application_handlers_web - - - + + + + ahriman_core->ahriman_application_lock - - - + + ahriman_models_auth_settings - -ahriman. -models. -auth_settings + +ahriman. +models. +auth_settings ahriman_core->ahriman_models_auth_settings - - + + ahriman_models_build_status - -ahriman. -models. -build_status + +ahriman. +models. +build_status ahriman_core->ahriman_models_build_status - - - + + ahriman_models_package - -ahriman. -models. -package + +ahriman. +models. +package ahriman_core->ahriman_models_package - - + ahriman_models_package_source - -ahriman. -models. -package_source + +ahriman. +models. +package_source ahriman_core->ahriman_models_package_source - - + + ahriman_models_report_settings - -ahriman. -models. -report_settings + +ahriman. +models. +report_settings ahriman_core->ahriman_models_report_settings - - + + ahriman_models_sign_settings - -ahriman. -models. -sign_settings + +ahriman. +models. +sign_settings ahriman_core->ahriman_models_sign_settings - - + + ahriman_models_upload_settings - -ahriman. -models. -upload_settings + +ahriman. +models. +upload_settings ahriman_core->ahriman_models_upload_settings - - - + + ahriman_web_middlewares_auth_handler - -ahriman. -web. -middlewares. -auth_handler + +ahriman. +web. +middlewares. +auth_handler ahriman_core->ahriman_web_middlewares_auth_handler - + + + ahriman_web_views_base - -ahriman. -web. -views. -base + +ahriman. +web. +views. +base ahriman_core->ahriman_web_views_base - + + + ahriman_web_views_index - -ahriman. -web. -views. -index + +ahriman. +web. +views. +index ahriman_core->ahriman_web_views_index - - - + + + + ahriman_web_views_service_reload_auth - -ahriman. -web. -views. -service. -reload_auth + +ahriman. +web. +views. +service. +reload_auth ahriman_core->ahriman_web_views_service_reload_auth - - + + + + - + ahriman_web_views_status_package - -ahriman. -web. -views. -status. -package + +ahriman. +web. +views. +status. +package ahriman_core->ahriman_web_views_status_package - - - + + - + ahriman_web_views_user_login - -ahriman. -web. -views. -user. -login + +ahriman. +web. +views. +user. +login ahriman_core->ahriman_web_views_user_login - + + - + ahriman_web_views_user_logout - -ahriman. -web. -views. -user. -logout + +ahriman. +web. +views. +user. +logout ahriman_core->ahriman_web_views_user_logout - - - - + + - + ahriman_web_web - -ahriman. -web. -web + +ahriman. +web. +web ahriman_core->ahriman_web_web - - - - + + ahriman_core_alpm - -ahriman. -core. -alpm + +ahriman. +core. +alpm ahriman_core_repository_properties - -ahriman. -core. -repository. -properties + +ahriman. +core. +repository. +properties ahriman_core_alpm->ahriman_core_repository_properties - - - + + ahriman_core_alpm->ahriman_models_package - - + ahriman_core_alpm_pacman - -ahriman. -core. -alpm. -pacman + +ahriman. +core. +alpm. +pacman ahriman_core_alpm_pacman->ahriman_core_repository_properties - - + + ahriman_core_alpm_pacman->ahriman_models_package - - + ahriman_core_alpm_repo - -ahriman. -core. -alpm. -repo + +ahriman. +core. +alpm. +repo ahriman_core_alpm_repo->ahriman_core_repository_properties - + ahriman_core_auth - -ahriman. -core. -auth + +ahriman. +core. +auth ahriman_core_auth->ahriman_web_middlewares_auth_handler - - + + ahriman_core_auth->ahriman_web_views_base - - + + ahriman_core_auth->ahriman_web_views_index - - + ahriman_core_auth->ahriman_web_views_service_reload_auth - + + ahriman_core_auth->ahriman_web_views_user_login - - - + + ahriman_core_auth->ahriman_web_views_user_logout - - - + + ahriman_core_auth->ahriman_web_web - + ahriman_core_auth_auth - -ahriman. -core. -auth. -auth + +ahriman. +core. +auth. +auth ahriman_core_auth_mapping - -ahriman. -core. -auth. -mapping + +ahriman. +core. +auth. +mapping ahriman_core_auth_auth->ahriman_core_auth_mapping - - - + + + ahriman_core_auth_auth->ahriman_web_middlewares_auth_handler - + ahriman_core_auth_auth->ahriman_web_views_base - - + + ahriman_core_auth_auth->ahriman_web_views_service_reload_auth - + + ahriman_core_auth_auth->ahriman_web_web - + ahriman_core_auth_helpers - -ahriman. -core. -auth. -helpers + +ahriman. +core. +auth. +helpers ahriman_core_auth_helpers->ahriman_web_views_index - + + ahriman_core_auth_helpers->ahriman_web_views_user_login - - + + ahriman_core_auth_helpers->ahriman_web_views_user_logout - - - + + ahriman_core_auth_oauth - -ahriman. -core. -auth. -oauth + +ahriman. +core. +auth. +oauth ahriman_core_auth_mapping->ahriman_core_auth_oauth - - + + ahriman_core_auth_oauth->ahriman_core_auth_auth - - + + ahriman_core_auth_oauth->ahriman_web_views_user_login - - + + ahriman_core_build_tools - -ahriman. -core. -build_tools + +ahriman. +core. +build_tools ahriman_core_build_tools->ahriman_application_application - + ahriman_core_repository_executor - -ahriman. -core. -repository. -executor + +ahriman. +core. +repository. +executor ahriman_core_build_tools->ahriman_core_repository_executor - - + + ahriman_core_tree - -ahriman. -core. -tree + +ahriman. +core. +tree ahriman_core_build_tools->ahriman_core_tree - - - + + ahriman_core_build_tools->ahriman_models_package - - + + + ahriman_core_build_tools_task - -ahriman. -core. -build_tools. -task + +ahriman. +core. +build_tools. +task ahriman_core_build_tools_task->ahriman_application_application - + + + + ahriman_core_build_tools_task->ahriman_core_repository_executor - - + + ahriman_core_build_tools_task->ahriman_core_tree - + + ahriman_core_configuration - -ahriman. -core. -configuration + +ahriman. +core. +configuration ahriman_core_configuration->ahriman_application_application - - - - - + + + ahriman_core_configuration->ahriman_application_handlers_add - - + + ahriman_core_configuration->ahriman_application_handlers_clean - - - - - + + + + ahriman_core_configuration->ahriman_application_handlers_dump - - + + ahriman_core_configuration->ahriman_application_handlers_handler - - + + + ahriman_core_configuration->ahriman_application_handlers_init - - - - - + + + + ahriman_core_configuration->ahriman_application_handlers_key_import - - - + + + + ahriman_core_configuration->ahriman_application_handlers_rebuild - - - + + ahriman_core_configuration->ahriman_application_handlers_remove - - - - + + ahriman_core_configuration->ahriman_application_handlers_remove_unknown - + ahriman_core_configuration->ahriman_application_handlers_report - - - + + + ahriman_core_configuration->ahriman_application_handlers_search - + + + ahriman_core_configuration->ahriman_application_handlers_setup - + + ahriman_core_configuration->ahriman_application_handlers_sign - - + + ahriman_core_configuration->ahriman_application_handlers_status - + + + ahriman_core_configuration->ahriman_application_handlers_status_update - - - + + ahriman_core_configuration->ahriman_application_handlers_sync - - + + + + ahriman_core_configuration->ahriman_application_handlers_update - - + + + ahriman_core_configuration->ahriman_application_handlers_user - - + + + ahriman_core_configuration->ahriman_application_handlers_web - + ahriman_core_configuration->ahriman_application_lock - - - - + + ahriman_core_configuration->ahriman_core_alpm_pacman - - + + ahriman_core_configuration->ahriman_core_auth_auth - - + + ahriman_core_configuration->ahriman_core_auth_mapping - - - + ahriman_core_configuration->ahriman_core_auth_oauth - - - + + ahriman_core_configuration->ahriman_core_build_tools_task - - - - + + + + ahriman_core_report_email - -ahriman. -core. -report. -email + +ahriman. +core. +report. +email ahriman_core_configuration->ahriman_core_report_email - - + + + + + ahriman_core_report_html - -ahriman. -core. -report. -html + +ahriman. +core. +report. +html ahriman_core_configuration->ahriman_core_report_html - - - + + ahriman_core_report_jinja_template - -ahriman. -core. -report. -jinja_template + +ahriman. +core. +report. +jinja_template ahriman_core_configuration->ahriman_core_report_jinja_template - - + + ahriman_core_report_report - -ahriman. -core. -report. -report + +ahriman. +core. +report. +report ahriman_core_configuration->ahriman_core_report_report - - + + + + ahriman_core_configuration->ahriman_core_repository_properties - - + + ahriman_core_sign_gpg - -ahriman. -core. -sign. -gpg + +ahriman. +core. +sign. +gpg ahriman_core_configuration->ahriman_core_sign_gpg - - - + + + ahriman_core_spawn - -ahriman. -core. -spawn + +ahriman. +core. +spawn ahriman_core_configuration->ahriman_core_spawn - + + ahriman_core_status_client - -ahriman. -core. -status. -client + +ahriman. +core. +status. +client ahriman_core_configuration->ahriman_core_status_client - - - + ahriman_core_status_watcher - -ahriman. -core. -status. -watcher + +ahriman. +core. +status. +watcher ahriman_core_configuration->ahriman_core_status_watcher - + + ahriman_core_status_web_client - -ahriman. -core. -status. -web_client + +ahriman. +core. +status. +web_client ahriman_core_configuration->ahriman_core_status_web_client - + + ahriman_core_upload_rsync - -ahriman. -core. -upload. -rsync + +ahriman. +core. +upload. +rsync ahriman_core_configuration->ahriman_core_upload_rsync - - - + + + ahriman_core_upload_s3 - -ahriman. -core. -upload. -s3 + +ahriman. +core. +upload. +s3 ahriman_core_configuration->ahriman_core_upload_s3 - - + ahriman_core_upload_upload - -ahriman. -core. -upload. -upload + +ahriman. +core. +upload. +upload ahriman_core_configuration->ahriman_core_upload_upload - - - - + ahriman_core_configuration->ahriman_web_views_base - - + + + + + ahriman_core_configuration->ahriman_web_web - + + + + ahriman_core_exceptions - -ahriman. -core. -exceptions + +ahriman. +core. +exceptions ahriman_core_exceptions->ahriman_application_handlers_handler - - - + + + + ahriman_core_exceptions->ahriman_application_handlers_status_update - - - - - + + ahriman_core_exceptions->ahriman_application_lock - - + + + ahriman_core_exceptions->ahriman_core_alpm_repo - - + ahriman_core_exceptions->ahriman_core_auth_auth - + + + + ahriman_core_exceptions->ahriman_core_auth_oauth - + + + ahriman_core_exceptions->ahriman_core_build_tools_task - - + + ahriman_core_exceptions->ahriman_core_configuration - - + + ahriman_core_exceptions->ahriman_core_report_report - - + ahriman_core_exceptions->ahriman_core_sign_gpg - - - + + ahriman_core_exceptions->ahriman_core_status_watcher - + + + + ahriman_core_exceptions->ahriman_core_upload_upload - - + + + ahriman_core_util - -ahriman. -core. -util + +ahriman. +core. +util ahriman_core_exceptions->ahriman_core_util - - - + + ahriman_core_exceptions->ahriman_models_auth_settings - - + + + ahriman_core_exceptions->ahriman_models_package - - - + + + ahriman_core_exceptions->ahriman_models_report_settings - - + + ahriman_core_exceptions->ahriman_models_sign_settings - - - + + ahriman_core_exceptions->ahriman_models_upload_settings - - + + + ahriman_core_exceptions->ahriman_web_views_status_package - - + + ahriman_core_exceptions->ahriman_web_web - + + ahriman_core_report - -ahriman. -core. -report + +ahriman. +core. +report ahriman_core_report->ahriman_core_repository_executor - - - + ahriman_core_report_email->ahriman_core_report_report - - - + + + ahriman_core_report_jinja_template->ahriman_core_report_email - - + + ahriman_core_report_jinja_template->ahriman_core_report_html - - - + + ahriman_core_report_report->ahriman_core_report_html - - - + + + ahriman_core_report_report->ahriman_core_repository_executor - + + + ahriman_core_repository - -ahriman. -core. -repository + +ahriman. +core. +repository ahriman_core_repository->ahriman_application_application - - + + ahriman_core_repository->ahriman_core_status_watcher - - + + ahriman_core_repository_cleaner - -ahriman. -core. -repository. -cleaner + +ahriman. +core. +repository. +cleaner ahriman_core_repository_cleaner->ahriman_core_repository_executor - - + + ahriman_core_repository_update_handler - -ahriman. -core. -repository. -update_handler + +ahriman. +core. +repository. +update_handler ahriman_core_repository_cleaner->ahriman_core_repository_update_handler - - + + ahriman_core_repository_repository - -ahriman. -core. -repository. -repository + +ahriman. +core. +repository. +repository ahriman_core_repository_executor->ahriman_core_repository_repository - - + + ahriman_core_repository_properties->ahriman_core_repository_cleaner - - + + ahriman_core_repository_repository->ahriman_application_application - - + + ahriman_core_repository_repository->ahriman_core_status_watcher - - + ahriman_core_repository_update_handler->ahriman_core_repository_repository - - + + ahriman_core_sign - -ahriman. -core. -sign + +ahriman. +core. +sign ahriman_core_sign->ahriman_core_report_jinja_template - - + + + ahriman_core_sign->ahriman_core_repository_properties - - + + ahriman_core_sign_gpg->ahriman_core_report_jinja_template - - + + ahriman_core_sign_gpg->ahriman_core_repository_properties - - + + + ahriman_core_spawn->ahriman_application_handlers_web - - + + ahriman_core_spawn->ahriman_web_views_base - - - + ahriman_core_spawn->ahriman_web_web - + + ahriman_core_status - -ahriman. -core. -status + +ahriman. +core. +status ahriman_core_status->ahriman_application_lock - + + ahriman_core_status->ahriman_core_repository_properties - - + + + ahriman_core_status->ahriman_web_views_base - - + + + + + + ahriman_core_status->ahriman_web_web - - + ahriman_core_status_client->ahriman_application_lock - - - + + + ahriman_core_status_client->ahriman_core_repository_properties - - + + ahriman_core_status_client->ahriman_core_status_web_client - - - + + + ahriman_core_status_watcher->ahriman_web_views_base - - + ahriman_core_status_watcher->ahriman_web_web - + + + ahriman_core_tree->ahriman_application_application - + ahriman_core_upload - -ahriman. -core. -upload + +ahriman. +core. +upload ahriman_core_upload->ahriman_core_repository_executor - + ahriman_core_upload_rsync->ahriman_core_upload_upload - - - + + + ahriman_core_upload_upload->ahriman_core_repository_executor - - + ahriman_core_upload_upload->ahriman_core_upload_s3 - - - + + + ahriman_core_util->ahriman_application_application - - + ahriman_core_util->ahriman_core_alpm_repo - - + + + + ahriman_core_util->ahriman_core_build_tools_task - + + ahriman_core_util->ahriman_core_report_email - - + + ahriman_core_util->ahriman_core_report_jinja_template - + + + ahriman_core_util->ahriman_core_repository_repository - - + + + ahriman_core_util->ahriman_core_sign_gpg - - + ahriman_core_util->ahriman_core_status_web_client - - - - + + ahriman_core_util->ahriman_core_upload_rsync - - - + + + ahriman_core_util->ahriman_models_build_status - - + + ahriman_core_util->ahriman_models_package - - + + + ahriman_core_util->ahriman_models_package_source - - + + ahriman_core_util->ahriman_web_views_index - - + + ahriman_models - -ahriman.models + +ahriman.models ahriman_models->ahriman_application_ahriman - - + + ahriman_models->ahriman_application_application - - - + + + + + + ahriman_models->ahriman_application_handlers_handler - - + + ahriman_models->ahriman_application_handlers_remove_unknown - - + + + ahriman_models->ahriman_application_handlers_setup - - + + + ahriman_models->ahriman_application_handlers_status - - + + ahriman_models->ahriman_application_handlers_user - + + ahriman_models->ahriman_application_lock - - + + ahriman_models->ahriman_core_alpm_repo - - + ahriman_models->ahriman_core_auth_auth - - - - + ahriman_models->ahriman_core_auth_mapping - - + + ahriman_models->ahriman_core_auth_oauth - - - - + + + ahriman_models->ahriman_core_build_tools_task - - + + ahriman_models->ahriman_core_report_email - - - + + + + ahriman_models->ahriman_core_report_html - - + + ahriman_models->ahriman_core_report_jinja_template - - + ahriman_models->ahriman_core_report_report - - - + + ahriman_models->ahriman_core_repository_executor - - - - + + + + ahriman_models->ahriman_core_repository_properties - - + + ahriman_models->ahriman_core_repository_repository - - - + + ahriman_models->ahriman_core_repository_update_handler - - - + + ahriman_models->ahriman_core_sign_gpg - - - + + ahriman_models->ahriman_core_spawn - - + + ahriman_models->ahriman_core_status_client - - - + + ahriman_models->ahriman_core_status_watcher - - - - + ahriman_models->ahriman_core_status_web_client - - + + + ahriman_models->ahriman_core_tree - - + + ahriman_models->ahriman_core_upload_rsync - - + + ahriman_models->ahriman_core_upload_s3 - - - + + + ahriman_models->ahriman_core_upload_upload - - + + ahriman_models->ahriman_web_middlewares_auth_handler - - - + ahriman_models->ahriman_web_views_base - - - + ahriman_models->ahriman_web_views_index - - + + ahriman_web_views_service_add - -ahriman. -web. -views. -service. -add + +ahriman. +web. +views. +service. +add ahriman_models->ahriman_web_views_service_add - + + + + ahriman_models->ahriman_web_views_service_reload_auth - - - + + + + + + + ahriman_web_views_service_remove - -ahriman. -web. -views. -service. -remove + +ahriman. +web. +views. +service. +remove ahriman_models->ahriman_web_views_service_remove - - + + + + + +ahriman_web_views_service_request + +ahriman. +web. +views. +service. +request + + + +ahriman_models->ahriman_web_views_service_request + + - + ahriman_web_views_service_search - -ahriman. -web. -views. -service. -search + +ahriman. +web. +views. +service. +search - + ahriman_models->ahriman_web_views_service_search - - + + - + ahriman_web_views_status_ahriman - -ahriman. -web. -views. -status. -ahriman + +ahriman. +web. +views. +status. +ahriman - + ahriman_models->ahriman_web_views_status_ahriman - - - + + - + ahriman_models->ahriman_web_views_status_package - - + + + - + ahriman_web_views_status_packages - -ahriman. -web. -views. -status. -packages + +ahriman. +web. +views. +status. +packages - + ahriman_models->ahriman_web_views_status_packages - - + + - + ahriman_web_views_status_status - -ahriman. -web. -views. -status. -status + +ahriman. +web. +views. +status. +status - + ahriman_models->ahriman_web_views_status_status - - - - + + - + ahriman_models->ahriman_web_views_user_login - - + + + + - + ahriman_models->ahriman_web_views_user_logout - + + - + ahriman_models_auth_settings->ahriman_core_auth_auth - - + + - + ahriman_models_auth_settings->ahriman_core_auth_mapping - - + + - + ahriman_models_auth_settings->ahriman_core_auth_oauth - - - + + - + ahriman_models_build_status->ahriman_application_ahriman - - + + - + ahriman_models_build_status->ahriman_application_handlers_status - - - - + + - + ahriman_models_build_status->ahriman_application_lock - + - + ahriman_models_build_status->ahriman_core_status_client - + + - + ahriman_models_build_status->ahriman_core_status_watcher - - + + + - + ahriman_models_build_status->ahriman_core_status_web_client - + + + + ahriman_models_counters - -ahriman. -models. -counters + +ahriman. +models. +counters - + ahriman_models_build_status->ahriman_models_counters - - + + - + ahriman_models_build_status->ahriman_web_views_status_ahriman - + + - + ahriman_models_build_status->ahriman_web_views_status_package - + + ahriman_models_internal_status - -ahriman. -models. -internal_status + +ahriman. +models. +internal_status - + ahriman_models_counters->ahriman_models_internal_status - - + + - + ahriman_models_counters->ahriman_web_views_status_status - + + - + ahriman_models_internal_status->ahriman_core_status_client - - + + - + ahriman_models_internal_status->ahriman_core_status_web_client - - - + + + - + ahriman_models_internal_status->ahriman_web_views_status_status - + + + - + ahriman_models_package->ahriman_application_application - - + - + ahriman_models_package->ahriman_application_handlers_remove_unknown - + + - + ahriman_models_package->ahriman_application_handlers_status - + + + + - + ahriman_models_package->ahriman_core_build_tools_task - - - + + + - + ahriman_models_package->ahriman_core_report_email - + + - + ahriman_models_package->ahriman_core_report_html - + + - + ahriman_models_package->ahriman_core_report_jinja_template - - - - + + + - + ahriman_models_package->ahriman_core_report_report - - - + + + - + ahriman_models_package->ahriman_core_repository_executor - + + - + ahriman_models_package->ahriman_core_repository_repository - - + + - + ahriman_models_package->ahriman_core_repository_update_handler - - - + + + + - + ahriman_models_package->ahriman_core_status_client - - + + + + - + ahriman_models_package->ahriman_core_status_watcher - - - - - + + - + ahriman_models_package->ahriman_core_status_web_client - - - + + - + ahriman_models_package->ahriman_core_tree - - + + + + - + ahriman_models_package->ahriman_core_upload_rsync - - + + - + ahriman_models_package->ahriman_core_upload_s3 - + + + - + ahriman_models_package->ahriman_core_upload_upload - - + + + - + ahriman_models_package->ahriman_models_counters - - + + - + ahriman_models_package->ahriman_web_views_status_package - + + ahriman_models_package_description - -ahriman. -models. -package_description + +ahriman. +models. +package_description - + ahriman_models_package_description->ahriman_models_package - - + + - + ahriman_models_package_source->ahriman_application_ahriman - + + + + - + ahriman_models_package_source->ahriman_application_application - + + + - + ahriman_models_package_source->ahriman_core_spawn - - - + + - + ahriman_models_report_settings->ahriman_core_report_report - - + ahriman_models_repository_paths - -ahriman. -models. -repository_paths + +ahriman. +models. +repository_paths - + ahriman_models_repository_paths->ahriman_application_handlers_handler - - - - + - + ahriman_models_repository_paths->ahriman_application_handlers_setup - - + + + - + ahriman_models_repository_paths->ahriman_core_alpm_repo - - + + + - + ahriman_models_repository_paths->ahriman_core_build_tools_task - - + - + ahriman_models_repository_paths->ahriman_core_repository_properties - - + + - + ahriman_models_repository_paths->ahriman_models_package - - + + - + ahriman_models_sign_settings->ahriman_application_ahriman - - + - + ahriman_models_sign_settings->ahriman_core_report_jinja_template - - + - + ahriman_models_sign_settings->ahriman_core_sign_gpg - + + ahriman_models_smtp_ssl_settings - -ahriman. -models. -smtp_ssl_settings + +ahriman. +models. +smtp_ssl_settings - + ahriman_models_smtp_ssl_settings->ahriman_core_report_email - + - + ahriman_models_upload_settings->ahriman_core_upload_upload - + + + ahriman_models_user - -ahriman. -models. -user + +ahriman. +models. +user - + ahriman_models_user->ahriman_application_handlers_user - - + + + - + ahriman_models_user->ahriman_core_auth_auth - + + - + ahriman_models_user->ahriman_core_auth_mapping - + + - + ahriman_models_user->ahriman_core_status_web_client - - + ahriman_models_user_access - -ahriman. -models. -user_access + +ahriman. +models. +user_access - + ahriman_models_user_access->ahriman_application_ahriman - - + + - + ahriman_models_user_access->ahriman_application_handlers_user - + + + - + ahriman_models_user_access->ahriman_core_auth_auth - - - - + + + + - + ahriman_models_user_access->ahriman_core_auth_mapping - + + + - + ahriman_models_user_access->ahriman_models_user - - + + - + ahriman_models_user_access->ahriman_web_middlewares_auth_handler - - - - + + - + ahriman_models_user_access->ahriman_web_views_base - - - - - + - + ahriman_models_user_access->ahriman_web_views_index - - + - + ahriman_models_user_access->ahriman_web_views_service_add - - - + + - + ahriman_models_user_access->ahriman_web_views_service_reload_auth - - - - + + - + ahriman_models_user_access->ahriman_web_views_service_remove - - - + + + + + + + +ahriman_models_user_access->ahriman_web_views_service_request + + + + + - + ahriman_models_user_access->ahriman_web_views_service_search - + + - + ahriman_models_user_access->ahriman_web_views_status_ahriman - - - + + - + ahriman_models_user_access->ahriman_web_views_status_package - - - + + + - + ahriman_models_user_access->ahriman_web_views_status_packages - - + + + + - + ahriman_models_user_access->ahriman_web_views_status_status - - - + + + - + ahriman_models_user_access->ahriman_web_views_user_login - + + - + ahriman_models_user_access->ahriman_web_views_user_logout - + + + ahriman_models_user_identity - -ahriman. -models. -user_identity + +ahriman. +models. +user_identity - + ahriman_models_user_identity->ahriman_web_middlewares_auth_handler - - + + - + ahriman_models_user_identity->ahriman_web_views_user_login - - + ahriman_version - -ahriman. -version + +ahriman. +version - + ahriman_version->ahriman_application_ahriman - - - + + + - + ahriman_version->ahriman_application_lock - - + + - + ahriman_version->ahriman_web_views_index - - + + + - + ahriman_version->ahriman_web_views_status_status - - + + + ahriman_web - -ahriman.web + +ahriman.web - + ahriman_web->ahriman_application_handlers_web - + ahriman_web_middlewares - -ahriman. -web. -middlewares + +ahriman. +web. +middlewares - + ahriman_web_middlewares->ahriman_web_web - - + + - + ahriman_web_middlewares_auth_handler->ahriman_web_web - - - + ahriman_web_middlewares_exception_handler - -ahriman. -web. -middlewares. -exception_handler + +ahriman. +web. +middlewares. +exception_handler - + ahriman_web_middlewares_exception_handler->ahriman_web_web - + ahriman_web_routes - -ahriman. -web. -routes + +ahriman. +web. +routes - + ahriman_web_routes->ahriman_web_web - - + + ahriman_web_views - -ahriman. -web. -views + +ahriman. +web. +views - + ahriman_web_views->ahriman_web_routes - - + + - + ahriman_web_views_base->ahriman_web_views_index - - + + - + ahriman_web_views_base->ahriman_web_views_service_add - - + + - + ahriman_web_views_base->ahriman_web_views_service_reload_auth - - + + - + ahriman_web_views_base->ahriman_web_views_service_remove - - + + + + + +ahriman_web_views_base->ahriman_web_views_service_request + + - + ahriman_web_views_base->ahriman_web_views_service_search - - + + - + ahriman_web_views_base->ahriman_web_views_status_ahriman - - + + - + ahriman_web_views_base->ahriman_web_views_status_package - - + + - + ahriman_web_views_base->ahriman_web_views_status_packages - - + + - + ahriman_web_views_base->ahriman_web_views_status_status - - + + - + ahriman_web_views_base->ahriman_web_views_user_login - - + + - + ahriman_web_views_base->ahriman_web_views_user_logout - - + + - + ahriman_web_views_index->ahriman_web_routes - + ahriman_web_views_service - -ahriman. -web. -views. -service + +ahriman. +web. +views. +service - + ahriman_web_views_service->ahriman_web_routes - + - + ahriman_web_views_service_add->ahriman_web_routes - + + - + ahriman_web_views_service_reload_auth->ahriman_web_routes - + - + ahriman_web_views_service_remove->ahriman_web_routes - + + + + +ahriman_web_views_service_request->ahriman_web_routes + + - + ahriman_web_views_service_search->ahriman_web_routes - - + - + ahriman_web_views_status - -ahriman. -web. -views. -status + +ahriman. +web. +views. +status - + ahriman_web_views_status->ahriman_web_routes - + - + ahriman_web_views_status_ahriman->ahriman_web_routes - + - + ahriman_web_views_status_package->ahriman_web_routes - + - + ahriman_web_views_status_packages->ahriman_web_routes - - - + - + ahriman_web_views_status_status->ahriman_web_routes - - + - + ahriman_web_views_user - -ahriman. -web. -views. -user + +ahriman. +web. +views. +user - + ahriman_web_views_user->ahriman_web_routes - + + + - + ahriman_web_views_user_login->ahriman_web_routes - + - + ahriman_web_views_user_logout->ahriman_web_routes - - - + - + ahriman_web_web->ahriman_application_handlers_web - + + - + aioauthclient - -aioauthclient + +aioauthclient - + aioauthclient->ahriman_core_auth_oauth - - + - + aiohttp - -aiohttp + +aiohttp - + aiohttp->ahriman_web_middlewares - - + + - + aiohttp->ahriman_web_middlewares_auth_handler - - - + + + + - + aiohttp->ahriman_web_middlewares_exception_handler - - + + - + aiohttp->ahriman_web_routes - + - + aiohttp->ahriman_web_views_base - - + - + aiohttp->ahriman_web_views_service_add - - + + - + aiohttp->ahriman_web_views_service_reload_auth - - - + + + - + aiohttp->ahriman_web_views_service_remove - - - - + + + + +aiohttp->ahriman_web_views_service_request + + - + aiohttp->ahriman_web_views_service_search - - - - - + + - + aiohttp->ahriman_web_views_status_ahriman - - + + + + + - + aiohttp->ahriman_web_views_status_package - - + + - + aiohttp->ahriman_web_views_status_packages - - - - + + + + + - + aiohttp->ahriman_web_views_status_status - - + + - + aiohttp->ahriman_web_views_user_login - - - + + - + aiohttp->ahriman_web_views_user_logout - - + + - + aiohttp->ahriman_web_web - - + + + - + aiohttpjinja2 - -aiohttpjinja2 + +aiohttpjinja2 - + aiohttp->aiohttpjinja2 - - - + + - + aiohttpsession - -aiohttpsession + +aiohttpsession - + aiohttp->aiohttpsession - - + + - + aiohttpdebugtoolbar - -aiohttpdebugtoolbar + +aiohttpdebugtoolbar - + aiohttpdebugtoolbar->ahriman_web_web - + + + - + aiohttpjinja2->ahriman_web_views_index - - + + - + aiohttpjinja2->ahriman_web_web - - - + - + aiohttpsecurity - -aiohttpsecurity + +aiohttpsecurity - + aiohttpsecurity->ahriman_core_auth_helpers - - + + - + aiohttpsecurity->ahriman_web_middlewares_auth_handler - + - + aiohttpsecurity->ahriman_web_views_service_reload_auth - - - + + - + aiohttpsession->ahriman_web_middlewares_auth_handler - + - + aur - -aur + +aur - + aur->ahriman_application_handlers_search - + + + - + aur->ahriman_models_package - - + + + - + aur->ahriman_web_views_service_search - - - + + - + boto3 - -boto3 + +boto3 - + boto3->ahriman_core_upload_s3 - - + + - + cryptography - -cryptography + +cryptography - + cryptography->ahriman_web_middlewares_auth_handler - - + - + cryptography->aiohttpsession - - - + + + - + requests - -requests + +requests - + cryptography->requests - - + + - + jinja2 - -jinja2 + +jinja2 - + jinja2->ahriman_core_report_jinja_template - - + + - + jinja2->ahriman_web_web - - - - + + + + - + jinja2->aiohttpjinja2 - - + + - + passlib - -passlib + +passlib - + passlib->ahriman_models_user - - + + - + pyalpm - -pyalpm + +pyalpm - + pyalpm->ahriman_core_alpm_pacman - - + + - + pyalpm->ahriman_models_package - - + + + - + pyalpm->ahriman_models_package_description - - - + + + + - + requests->ahriman_core_sign_gpg - + + - + requests->ahriman_core_status_web_client - + + - + requests->ahriman_core_util - + + - + requests->aur - - + + - + srcinfo - -srcinfo + +srcinfo - + srcinfo->ahriman_models_package - - + diff --git a/docs/architecture.md b/docs/architecture.md index f066fa9c..5fa7e6b2 100644 --- a/docs/architecture.md +++ b/docs/architecture.md @@ -148,6 +148,7 @@ Some features require optional dependencies to be installed: Web application requires the following python packages to be installed: * Core part requires `aiohttp` (application itself), `aiohttp_jinja2` and `Jinja2` (HTML generation from templates). +* In addition, `aiohttp_debugtoolbar` is required for debug panel. Please note that this option does not work together with authorization and basically must not be used in production. * In addition, authorization feature requires `aiohttp_security`, `aiohttp_session` and `cryptography`. * In addition to base authorization dependencies, OAuth2 also requires `aioauth-client` library. @@ -173,9 +174,9 @@ Package provides base jinja templates which can be overridden by settings. Vanil ## Requests and scopes -Service provides optional authorization which can be turned on in settings. In order to control user access there are two levels of authorization - read-only (only GET-like requests) and write (anything). +Service provides optional authorization which can be turned on in settings. In order to control user access there are two levels of authorization - read-only (only GET-like requests) and write (anything) which are provided by each web view directly. -If this feature is configured any request except for whitelisted will be prohibited without authentication. In addition, configuration flag `auth.allow_read_only` can be used in order to allow seeing main page without authorization (this page is in default white list). +If this feature is configured any request will be prohibited without authentication. In addition, configuration flag `auth.safe_build_status` can be used in order to allow seeing main page without authorization. For authenticated users it uses encrypted session cookies to store tokens; encryption key is generated each time at the start of the application. It also stores expiration time of the session inside. diff --git a/docs/configuration.md b/docs/configuration.md index d7ffa15c..2299b8fa 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -23,12 +23,12 @@ libalpm and AUR related configuration. Base authorization settings. `OAuth` provider requires `aioauth-client` library to be installed. * `target` - specifies authorization provider, string, optional, default `disabled`. Allowed values are `disabled`, `configuration`, `oauth`. -* `allow_read_only` - allow requesting read only pages without authorization, boolean, required. * `client_id` - OAuth2 application client ID, string, required in case if `oauth` is used. * `client_secret` - OAuth2 application client secret key, string, required in case if `oauth` is used. * `max_age` - parameter which controls both cookie expiration and token expiration inside the service, integer, optional, default is 7 days. * `oauth_provider` - OAuth2 provider class name as is in `aioauth-client` (e.g. `GoogleClient`, `GithubClient` etc), string, required in case if `oauth` is used. * `oauth_scopes` - scopes list for OAuth2 provider, which will allow retrieving user email (which is used for checking user permissions), e.g. `https://www.googleapis.com/auth/userinfo.email` for `GoogleClient` or `user:email` for `GithubClient`, space separated list of strings, required in case if `oauth` is used. +* `safe_build_status` - allow requesting status page without authorization, boolean, required. * `salt` - password hash salt, string, required in case if authorization enabled (automatically generated by `create-user` subcommand). ## `auth:*` groups diff --git a/package/etc/ahriman.ini b/package/etc/ahriman.ini index ec1b3237..cb143ba6 100644 --- a/package/etc/ahriman.ini +++ b/package/etc/ahriman.ini @@ -10,10 +10,10 @@ root = / [auth] target = disabled -allow_read_only = yes max_age = 604800 oauth_provider = GoogleClient oauth_scopes = https://www.googleapis.com/auth/userinfo.email +safe_build_status = yes [build] archbuild_flags = diff --git a/package/share/ahriman/build-status/package-actions-modals.jinja2 b/package/share/ahriman/build-status/package-actions-modals.jinja2 index fb72034d..8dcd1ae8 100644 --- a/package/share/ahriman/build-status/package-actions-modals.jinja2 +++ b/package/share/ahriman/build-status/package-actions-modals.jinja2 @@ -16,6 +16,7 @@
+
diff --git a/package/share/ahriman/build-status/package-actions-script.jinja2 b/package/share/ahriman/build-status/package-actions-script.jinja2 index 3c6d41c3..80c26d48 100644 --- a/package/share/ahriman/build-status/package-actions-script.jinja2 +++ b/package/share/ahriman/build-status/package-actions-script.jinja2 @@ -80,6 +80,11 @@ doPackageAction("/service-api/v1/add", $packages); } + function requestPackages() { + const $packages = [$package.val()] + doPackageAction("/service-api/v1/request", $packages); + } + function removePackages() { doPackageAction("/service-api/v1/remove", getSelection()); } function updatePackages() { doPackageAction("/service-api/v1/add", getSelection()); } diff --git a/src/ahriman/core/auth/auth.py b/src/ahriman/core/auth/auth.py index a953d538..e20ba508 100644 --- a/src/ahriman/core/auth/auth.py +++ b/src/ahriman/core/auth/auth.py @@ -33,9 +33,9 @@ from ahriman.models.user_access import UserAccess class Auth: """ helper to deal with user authorization - :ivar allow_read_only: allow read only access to the index page :ivar enabled: indicates if authorization is enabled :ivar max_age: session age in seconds. It will be used for both client side and server side checks + :ivar safe_build_status: allow read only access to the index page """ def __init__(self, configuration: Configuration, provider: AuthSettings = AuthSettings.Disabled) -> None: @@ -46,7 +46,7 @@ class Auth: """ self.logger = logging.getLogger("http") - self.allow_read_only = configuration.getboolean("auth", "allow_read_only") + self.safe_build_status = configuration.getboolean("auth", "safe_build_status") self.enabled = provider.is_enabled self.max_age = configuration.getint("auth", "max_age", fallback=7 * 24 * 3600) diff --git a/src/ahriman/web/routes.py b/src/ahriman/web/routes.py index cbdad29e..b00096cf 100644 --- a/src/ahriman/web/routes.py +++ b/src/ahriman/web/routes.py @@ -24,6 +24,7 @@ from ahriman.web.views.index import IndexView from ahriman.web.views.service.add import AddView from ahriman.web.views.service.reload_auth import ReloadAuthView from ahriman.web.views.service.remove import RemoveView +from ahriman.web.views.service.request import RequestView from ahriman.web.views.service.search import SearchView from ahriman.web.views.status.ahriman import AhrimanView from ahriman.web.views.status.package import PackageView @@ -48,6 +49,8 @@ def setup_routes(application: Application, static_path: Path) -> None: POST /service-api/v1/remove remove existing package from repository + POST /service-api/v1/request request to add new packages to repository + GET /service-api/v1/search search for substring in AUR POST /service-api/v1/update update packages in repository, actually it is just alias for add @@ -82,6 +85,8 @@ def setup_routes(application: Application, static_path: Path) -> None: application.router.add_post("/service-api/v1/remove", RemoveView) + application.router.add_post("/service-api/v1/request", RequestView) + application.router.add_get("/service-api/v1/search", SearchView, allow_head=False) application.router.add_post("/service-api/v1/update", AddView) diff --git a/src/ahriman/web/views/index.py b/src/ahriman/web/views/index.py index 23e4021a..46877ab7 100644 --- a/src/ahriman/web/views/index.py +++ b/src/ahriman/web/views/index.py @@ -93,8 +93,9 @@ class IndexView(BaseView): # auth block auth_username = await authorized_userid(self.request) + authenticated = not self.validator.enabled or self.validator.safe_build_status or auth_username is not None auth = { - "authenticated": not self.validator.enabled or self.validator.allow_read_only or auth_username is not None, + "authenticated": authenticated, "control": self.validator.auth_control, "enabled": self.validator.enabled, "username": auth_username, diff --git a/src/ahriman/web/views/service/add.py b/src/ahriman/web/views/service/add.py index 0e7a571c..63a52426 100644 --- a/src/ahriman/web/views/service/add.py +++ b/src/ahriman/web/views/service/add.py @@ -37,8 +37,7 @@ class AddView(BaseView): JSON body must be supplied, the following model is used: { - "packages": "ahriman", # either list of packages or package name as in AUR - "build_now": true # optional flag which runs build + "packages": "ahriman" # either list of packages or package name as in AUR } :return: redirect to main page on success @@ -46,11 +45,10 @@ class AddView(BaseView): data = await self.extract_data(["packages"]) try: - now = data.get("build_now", True) packages = data["packages"] except Exception as e: return json_response(data=str(e), status=400) - self.spawner.packages_add(packages, now) + self.spawner.packages_add(packages, now=True) raise HTTPFound("/") diff --git a/src/ahriman/web/views/service/request.py b/src/ahriman/web/views/service/request.py new file mode 100644 index 00000000..611ca7fa --- /dev/null +++ b/src/ahriman/web/views/service/request.py @@ -0,0 +1,54 @@ +# +# Copyright (c) 2021 ahriman team. +# +# This file is part of ahriman +# (see https://github.com/arcan1s/ahriman). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +from aiohttp.web import HTTPFound, Response, json_response + +from ahriman.models.user_access import UserAccess +from ahriman.web.views.base import BaseView + + +class RequestView(BaseView): + """ + request package web view. It is actually the same as AddView, but without now + :cvar POST_PERMISSION: post permissions of self + """ + + POST_PERMISSION = UserAccess.Read + + async def post(self) -> Response: + """ + request to add new package + + JSON body must be supplied, the following model is used: + { + "packages": "ahriman" # either list of packages or package name as in AUR + } + + :return: redirect to main page on success + """ + data = await self.extract_data(["packages"]) + + try: + packages = data["packages"] + except Exception as e: + return json_response(data=str(e), status=400) + + self.spawner.packages_add(packages, now=False) + + raise HTTPFound("/") diff --git a/tests/ahriman/web/views/service/test_views_service_add.py b/tests/ahriman/web/views/service/test_views_service_add.py index 8f03b3b4..592e3aba 100644 --- a/tests/ahriman/web/views/service/test_views_service_add.py +++ b/tests/ahriman/web/views/service/test_views_service_add.py @@ -24,18 +24,7 @@ async def test_post(client: TestClient, mocker: MockerFixture) -> None: response = await client.post("/service-api/v1/add", json={"packages": ["ahriman"]}) assert response.ok - add_mock.assert_called_with(["ahriman"], True) - - -async def test_post_now(client: TestClient, mocker: MockerFixture) -> None: - """ - must call post and run build - """ - add_mock = mocker.patch("ahriman.core.spawn.Spawn.packages_add") - response = await client.post("/service-api/v1/add", json={"packages": ["ahriman"], "build_now": False}) - - assert response.ok - add_mock.assert_called_with(["ahriman"], False) + add_mock.assert_called_with(["ahriman"], now=True) async def test_post_exception(client: TestClient, mocker: MockerFixture) -> None: @@ -57,4 +46,4 @@ async def test_post_update(client: TestClient, mocker: MockerFixture) -> None: response = await client.post("/service-api/v1/update", json={"packages": ["ahriman"]}) assert response.ok - add_mock.assert_called_with(["ahriman"], True) + add_mock.assert_called_with(["ahriman"], now=True) diff --git a/tests/ahriman/web/views/service/test_views_service_request.py b/tests/ahriman/web/views/service/test_views_service_request.py new file mode 100644 index 00000000..550ba926 --- /dev/null +++ b/tests/ahriman/web/views/service/test_views_service_request.py @@ -0,0 +1,38 @@ +import pytest + +from aiohttp.test_utils import TestClient +from pytest_mock import MockerFixture + +from ahriman.models.user_access import UserAccess +from ahriman.web.views.service.request import RequestView + + +async def test_get_permission() -> None: + """ + must return correct permission for the request + """ + for method in ("POST",): + request = pytest.helpers.request("", "", method) + assert await RequestView.get_permission(request) == UserAccess.Read + + +async def test_post(client: TestClient, mocker: MockerFixture) -> None: + """ + must call post request correctly + """ + add_mock = mocker.patch("ahriman.core.spawn.Spawn.packages_add") + response = await client.post("/service-api/v1/request", json={"packages": ["ahriman"]}) + + assert response.ok + add_mock.assert_called_with(["ahriman"], now=False) + + +async def test_post_exception(client: TestClient, mocker: MockerFixture) -> None: + """ + must raise exception on missing packages payload + """ + add_mock = mocker.patch("ahriman.core.spawn.Spawn.packages_add") + response = await client.post("/service-api/v1/request") + + assert response.status == 400 + add_mock.assert_not_called() diff --git a/tests/testresources/core/ahriman.ini b/tests/testresources/core/ahriman.ini index f7ccf833..b4e5b522 100644 --- a/tests/testresources/core/ahriman.ini +++ b/tests/testresources/core/ahriman.ini @@ -9,12 +9,12 @@ repositories = core extra community multilib root = / [auth] -allow_read_only = no client_id = client_id client_secret = client_secret oauth_provider = GoogleClient oauth_scopes = https://www.googleapis.com/auth/userinfo.email salt = salt +safe_build_status = no [build] archbuild_flags =