From cc4e66a5b110623afe243f39899fbbc0b0ae7de4 Mon Sep 17 00:00:00 2001 From: Guillaume Rousse <guillaume.rousse@renater.fr> Date: Fri, 2 Mar 2018 15:32:08 +0100 Subject: [PATCH] rename application as Access Check Manager --- README.md | 24 ++++++------- bin/Makefile.am | 10 +++--- ...ger.cgi.in => access-check-manager.cgi.in} | 0 ...nager.pl.in => access-check-manager.pl.in} | 0 configure.ac | 8 ++--- lib/Makefile.am | 2 +- t/cgi.t | 8 ++--- t/cli.t | 34 +++++++++---------- 8 files changed, 43 insertions(+), 43 deletions(-) rename bin/{account-manager.cgi.in => access-check-manager.cgi.in} (100%) rename bin/{account-manager.pl.in => access-check-manager.pl.in} (100%) diff --git a/README.md b/README.md index 3ec6b70..571bddb 100644 --- a/README.md +++ b/README.md @@ -36,11 +36,11 @@ A database has to be created, and its schema populated. For instance, with Maria ``` $> mysqladmin create -u root -p access_check Enter password: -$> mysql -u root -p account_manager < conf/account_manager.sql +$> mysql -u root -p access_check < conf/manager.sql Enter password: $> mysql -u root -p mysql Enter password: -MariaDB [mysql]> grant all privileges on account_manager.* to account_manager@localhost identified by 's3cr3t'; +MariaDB [mysql]> grant all privileges on access_check.* to access_check@localhost identified by 's3cr3t'; Query OK, 0 rows affected (0.00 sec) MariaDB [mysql]> quit ``` @@ -48,21 +48,21 @@ MariaDB [mysql]> quit The web server has to be configured to map access to the CGI script. For instance, with Apache: ``` - Alias /account-manager /usr/local/share/account-managerk/www - <Directory /usr/local/share/account-manager/www> + Alias /access-check /usr/local/share/access-check/www + <Directory /usr/local/share/access-check/www> Require all granted Options ExecCGI - DirectoryIndex account-manager.cgi + DirectoryIndex access-check-manager.cgi AddHandler cgi-script .cgi </Directory> ``` Additional directories have to be created for logs and data, with write permission for the web server: ``` -$> sudo mkdir /var/log/account-manager -$> sudo mkdir /var/lib/account-manager -$> sudo chown apache.apache /var/log/account-manager -$> sudo chown apache.apache /var/lib/account-manager +$> sudo mkdir /var/log/access-check +$> sudo mkdir /var/lib/access-check +$> sudo chown apache.apache /var/log/access-check +$> sudo chown apache.apache /var/lib/access-check ``` The application has to be properly configured, using the installed ```manager.conf``` file. @@ -70,15 +70,15 @@ The application has to be properly configured, using the installed ```manager.co A cron task has to be set for downloading federation metadata. For instance: ``` # download eduGAIN metadata hourly -01 * * * * root curl --silent http://mds.edugain.org/ -o /var/lib/account-manager/edugain.xml +01 * * * * root curl --silent http://mds.edugain.org/ -o /var/lib/access-manager/edugain.xml ``` Another cron task has to be set for purging expired tokens and accounts. For instance: ``` # purge expired tokens hourly -01 * * * * root /usr/local/bin/account-manager.pl list_tokens --expired --delete > /dev/null +01 * * * * root /usr/local/bin/access-check-manager.pl list_tokens --expired --delete > /dev/null # purge expired accounts daily -02 0 * * * root /usr/local/bin/account-manager.pl list_accounts --expired --delete > /dev/null +02 0 * * * root /usr/local/bin/access-check-manager.pl list_accounts --expired --delete > /dev/null ``` ## Identity Provider diff --git a/bin/Makefile.am b/bin/Makefile.am index bb7b179..7122811 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,19 +1,19 @@ -bin_SCRIPTS = account-manager.pl +bin_SCRIPTS = access-check-manager.pl -www_SCRIPTS = account-manager.cgi +www_SCRIPTS = access-check-manager.cgi CLEANFILES = $(bin_SCRIPTS) $(www_SCRIPTS) -EXTRA_DIST = account-manager.pl.in account-manager.cgi.in +EXTRA_DIST = access-check-manager.pl.in access-check-manager.cgi.in -account-manager.pl: Makefile account-manager.pl.in +access-check-manager.pl: Makefile access-check-manager.pl.in sed \ -e 's|[@]modulesdir[@]|$(modulesdir)|' \ -e 's|[@]sysconfdir[@]|$(sysconfdir)|' \ < $(srcdir)/$@.in > $@ chmod +x $@ -account-manager.cgi: Makefile account-manager.cgi.in +access-check-manager.cgi: Makefile access-check-manager.cgi.in sed \ -e 's|[@]modulesdir[@]|$(modulesdir)|' \ -e 's|[@]sysconfdir[@]|$(sysconfdir)|' \ diff --git a/bin/account-manager.cgi.in b/bin/access-check-manager.cgi.in similarity index 100% rename from bin/account-manager.cgi.in rename to bin/access-check-manager.cgi.in diff --git a/bin/account-manager.pl.in b/bin/access-check-manager.pl.in similarity index 100% rename from bin/account-manager.pl.in rename to bin/access-check-manager.pl.in diff --git a/configure.ac b/configure.ac index 6ff503b..787c7d0 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ AC_PREREQ(2.59) -AC_INIT([Account Manager], 1.0) +AC_INIT([Access Check Manager], 1.0) AM_INIT_AUTOMAKE([foreign]) AC_REQUIRE_AUX_FILE([tap-driver.sh]) -wwwdir=$datadir/account-manager/www -modulesdir=$datadir/account-manager/lib -templatesdir=$datadir/account-manager/templates +wwwdir=$datadir/access-check/www +modulesdir=$datadir/access-check/lib +templatesdir=$datadir/access-check/templates AC_SUBST(wwwdir) AC_SUBST(modulesdir) diff --git a/lib/Makefile.am b/lib/Makefile.am index c74dc66..14126a5 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,4 +1,4 @@ -modulesdir = $(pkgdatadir)/lib +modulesdir = $(datadir)/access-check/lib nobase_modules_DATA = \ AccountManager/Token.pm \ diff --git a/t/cgi.t b/t/cgi.t index 202728e..9b732d4 100755 --- a/t/cgi.t +++ b/t/cgi.t @@ -26,7 +26,7 @@ subtest start_page => sub { local $ENV{REQUEST_METHOD} = 'GET'; local $ENV{QUERY_STRING} = ''; - my ($out, $err, $rc) = run_executable('account-manager.cgi'); + my ($out, $err, $rc) = run_executable('access-check-manager.cgi'); diag($out) if $ENV{TEST_DEBUG}; like( $out, @@ -53,7 +53,7 @@ subtest sp_selection_page => sub { local $ENV{REQUEST_METHOD} = 'GET'; local $ENV{QUERY_STRING} = 'action=select_sp'; - my ($out, $err, $rc) = run_executable('account-manager.cgi'); + my ($out, $err, $rc) = run_executable('access-check-manager.cgi'); diag($out) if $ENV{TEST_DEBUG}; like( $out, @@ -80,7 +80,7 @@ subtest email_selection_page_missing_parameter => sub { local $ENV{REQUEST_METHOD} = 'GET'; local $ENV{QUERY_STRING} = 'action=select_email'; - my ($out, $err, $rc) = run_executable('account-manager.cgi'); + my ($out, $err, $rc) = run_executable('access-check-manager.cgi'); diag($out) if $ENV{TEST_DEBUG}; like( $out, @@ -107,7 +107,7 @@ subtest email_selection_page_wrong_parameter => sub { local $ENV{REQUEST_METHOD} = 'GET'; local $ENV{QUERY_STRING} = 'action=select_email&entityid=foo'; - my ($out, $err, $rc) = run_executable('account-manager.cgi'); + my ($out, $err, $rc) = run_executable('access-check-manager.cgi'); diag($out) if $ENV{TEST_DEBUG}; like( $out, diff --git a/t/cli.t b/t/cli.t index d0d11dd..d016df0 100755 --- a/t/cli.t +++ b/t/cli.t @@ -12,7 +12,7 @@ plan tests => 48; my ($out, $err, $rc); -($out, $err, $rc) = run_executable('account-manager.pl', '--help'); +($out, $err, $rc) = run_executable('access-check-manager.pl', '--help'); ok($rc == 0, '--help exit status'); is($err, '', '--help stderr'); like( @@ -21,7 +21,7 @@ like( '--help stdout' ); -($out, $err, $rc) = run_executable('account-manager.pl'); +($out, $err, $rc) = run_executable('access-check-manager.pl'); ok($rc == 2, 'no action exit status'); like( $err, @@ -62,21 +62,21 @@ EOF # reset database content ($out, $err, $rc) = run_executable( - 'account-manager.pl', + 'access-check-manager.pl', "--config $config_file list_accounts --delete" ); ok($rc == 0, 'delete accounts exit status'); is($err, '', 'delete accounts stderr output'); ($out, $err, $rc) = run_executable( - 'account-manager.pl', + 'access-check-manager.pl', "--config $config_file list_tokens --delete" ); ok($rc == 0, 'delete tokens exit status'); is($err, '', 'delete tokens stderr output'); ($out, $err, $rc) = run_executable( - 'account-manager.pl', + 'access-check-manager.pl', "--config $config_file list_services --delete" ); ok($rc == 0, 'delete services exit status'); @@ -86,7 +86,7 @@ EOF # initial list ($out, $err, $rc) = run_executable( - 'account-manager.pl', + 'access-check-manager.pl', "--config $config_file list_accounts" ); ok($rc == 0, 'list accounts exit status'); @@ -95,7 +95,7 @@ EOF # creation failure ($out, $err, $rc) = run_executable( - 'account-manager.pl', + 'access-check-manager.pl', "--config $config_file add_account" ); ok($rc == 2, 'add account without mandatory option exit status'); @@ -108,7 +108,7 @@ EOF # creation success ($out, $err, $rc) = run_executable( - 'account-manager.pl', + 'access-check-manager.pl', "--config $config_file add_account --profile foo --sp_entityid bar" ); ok($rc == 0, 'add account with mandatory option exit status'); @@ -117,7 +117,7 @@ EOF # final list ($out, $err, $rc) = run_executable( - 'account-manager.pl', + 'access-check-manager.pl', "--config $config_file list_accounts" ); ok($rc == 0, 'list accounts exit status'); @@ -128,7 +128,7 @@ EOF # initial list ($out, $err, $rc) = run_executable( - 'account-manager.pl', + 'access-check-manager.pl', "--config $config_file list_services" ); ok($rc == 0, 'list services exit status'); @@ -137,7 +137,7 @@ EOF # creation failure ($out, $err, $rc) = run_executable( - 'account-manager.pl', + 'access-check-manager.pl', "--config $config_file add_service" ); ok($rc == 2, 'add service without mandatory option exit status'); @@ -150,7 +150,7 @@ EOF # creation success ($out, $err, $rc) = run_executable( - 'account-manager.pl', + 'access-check-manager.pl', "--config $config_file add_service --sp_entityid bar --contacts joe,bob" ); ok($rc == 0, 'add service with mandatory option exit status'); @@ -159,7 +159,7 @@ EOF # final list ($out, $err, $rc) = run_executable( - 'account-manager.pl', + 'access-check-manager.pl', "--config $config_file list_services" ); ok($rc == 0, 'list services exit status'); @@ -170,7 +170,7 @@ EOF # initial list ($out, $err, $rc) = run_executable( - 'account-manager.pl', + 'access-check-manager.pl', "--config $config_file list_tokens" ); ok($rc == 0, 'list tokens exit status'); @@ -179,7 +179,7 @@ EOF # creation failure ($out, $err, $rc) = run_executable( - 'account-manager.pl', + 'access-check-manager.pl', "--config $config_file add_token" ); ok($rc == 2, 'add token without mandatory option exit status'); @@ -192,7 +192,7 @@ EOF # creation success ($out, $err, $rc) = run_executable( - 'account-manager.pl', + 'access-check-manager.pl', "--config $config_file add_token --sp_entityid bar --email_address joe" ); ok($rc == 0, 'add token with mandatory option exit status'); @@ -201,7 +201,7 @@ EOF # final list ($out, $err, $rc) = run_executable( - 'account-manager.pl', + 'access-check-manager.pl', "--config $config_file list_tokens" ); ok($rc == 0, 'list tokens exit status'); -- GitLab