From dd607f224d351d183418668bc090a53800484002 Mon Sep 17 00:00:00 2001 From: Bruno Cesar Ribas Date: Wed, 22 Aug 2018 00:35:17 -0300 Subject: Creating multiple packages for boca Until now we had only one package for boca that contains all files. This approach is not correct since we may have multiple machines for some specific part of boca, eg, database and autojudge. This commit starts this new approach by updating Makefile, d/rules, d/*conffiles d/*postinst Signed-off-by: Bruno Cesar Ribas --- Makefile | 17 ++++++++++---- debian/boca-web.conffiles | 1 + debian/boca-web.postinst | 11 +++++++++ debian/boca.conffiles | 1 - debian/boca.postinst | 11 --------- debian/compat | 2 +- debian/control | 59 +++++++++++++++++++++++++++++++++++++---------- debian/postinst | 6 ----- debian/rules | 6 +++-- 9 files changed, 77 insertions(+), 37 deletions(-) create mode 100644 debian/boca-web.conffiles create mode 100644 debian/boca-web.postinst delete mode 100644 debian/boca.conffiles delete mode 100644 debian/boca.postinst delete mode 100644 debian/postinst diff --git a/Makefile b/Makefile index 9246450..a0280ca 100644 --- a/Makefile +++ b/Makefile @@ -20,17 +20,26 @@ install-bocaapache: install-bocawww install-scripts: mkdir -p $(DESTDIR)/usr/sbin/ install tools/dump.sh $(DESTDIR)/usr/sbin/boca-dump - install tools/boca-createjail $(DESTDIR)/usr/sbin/boca-createjail + +install-bocadb: install tools/boca-createdb.sh $(DESTDIR)/usr/sbin/boca-createdb - install tools/boca-autojudge.sh $(DESTDIR)/usr/sbin/boca-autojudge + +install-bocacommon: + mkdir -p $(DESTDIR)/usr/sbin/ + mkdir -p $(DESTDIR)/etc/ + cp tools/boca.conf $(DESTDIR)/etc/ install tools/boca-config-dbhost.sh $(DESTDIR)/usr/sbin/boca-config-dbhost -install: install-bocawww install-bocaapache install-scripts tools/safeexec +install-bocaautojudge: tools/safeexec + mkdir -p $(DESTDIR)/usr/sbin/ mkdir -p $(DESTDIR)/usr/bin/ mkdir -p $(DESTDIR)/etc/ - cp tools/boca.conf $(DESTDIR)/etc/ install tools/safeexec $(DESTDIR)/usr/bin/safeexec chmod 4555 $(DESTDIR)/usr/bin/safeexec + install tools/boca-createjail $(DESTDIR)/usr/sbin/boca-createjail + install tools/boca-autojudge.sh $(DESTDIR)/usr/sbin/boca-autojudge + +install: install-bocawww install-bocaapache install-bocadb install-bocacommon install-bocaautojudge install-scripts install-submission-tools: tools/boca-submit-run-root-wrapper mkdir -p $(DESTDIR)/usr/bin $(DESTDIR)/usr/sbin $(DESTDIR)/etc/cron.d diff --git a/debian/boca-web.conffiles b/debian/boca-web.conffiles new file mode 100644 index 0000000..b004c7a --- /dev/null +++ b/debian/boca-web.conffiles @@ -0,0 +1 @@ +/var/www/boca/src/private/conf.php diff --git a/debian/boca-web.postinst b/debian/boca-web.postinst new file mode 100644 index 0000000..18ce749 --- /dev/null +++ b/debian/boca-web.postinst @@ -0,0 +1,11 @@ +#!/bin/bash + +chown -R www-data.www-data /var/www/boca +chmod -R go-rwx /var/www/boca/src/private +chmod 4555 /usr/bin/safeexec + +a2ensite default-ssl +a2enmod ssl +a2enmod socache_shmcb + +service apache2 restart || true diff --git a/debian/boca.conffiles b/debian/boca.conffiles deleted file mode 100644 index b004c7a..0000000 --- a/debian/boca.conffiles +++ /dev/null @@ -1 +0,0 @@ -/var/www/boca/src/private/conf.php diff --git a/debian/boca.postinst b/debian/boca.postinst deleted file mode 100644 index 18ce749..0000000 --- a/debian/boca.postinst +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -chown -R www-data.www-data /var/www/boca -chmod -R go-rwx /var/www/boca/src/private -chmod 4555 /usr/bin/safeexec - -a2ensite default-ssl -a2enmod ssl -a2enmod socache_shmcb - -service apache2 restart || true diff --git a/debian/compat b/debian/compat index 7f8f011..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +10 diff --git a/debian/control b/debian/control index fbac1f3..f3fdd17 100644 --- a/debian/control +++ b/debian/control @@ -2,24 +2,59 @@ Source: boca Section: misc Priority: optional Maintainer: BOCA Development Team +Uploaders: Cassio Polpo de Campos , Bruno Cesar Ribas Build-Depends: debhelper, build-essential -Package: maratona-boca -Architecture: all -Depends: boca -Description: Virtual package that depends on BOCA - Package: boca -Architecture: amd64 -Depends: php-zip, debootstrap, schroot, quotatool, makepasswd, apache2, libapache2-mod-php, sharutils, wget, coreutils, php, php-cli, php-mcrypt, php-pgsql, php-gd, postgresql, postgresql-client, libany-uri-escape-perl, php-xml +Architecture: all +Depends: boca-common, boca-web, boca-db, boca-autojudge +Provides: maratona-boca Description: BOCA is a software created to control a contest with the ACM ICPC rules. BOCA is a software created to control a contest with the ACM International Collegiate Programming Contest rules. It has been developed in PHP and the interaction between judges and the system is done through a web browser. + . + This package install all boca related packages to run everything in one + single machine. + +Package: boca-db +Architecture: all +Pre-depends: postgresql +Depends: boca-common +Description: BOCA - database + BOCA is a software created to control a contest with the ACM International + Collegiate Programming Contest rules. It has been developed in PHP and the + interaction between judges and the system is done through a web browser. + . + This package provides a full database to run a contest on. + +Package: boca-web +Architecture: all +Depends: boca-common, apache2, php, php-fpm +Description: BOCA - WEB files + BOCA is a software created to control a contest with the ACM International + Collegiate Programming Contest rules. It has been developed in PHP and the + interaction between judges and the system is done through a web browser. + . + This package provides only web contents. -Package: boca-submission-tools +Package: boca-common +Architecture: all +Depends: php-zip, makepasswd, sharutils, wget, coreutils, php-cli, php-mcrypt, php-pgsql, php-gd, postgresql-client +Description: BOCA - Common files + BOCA is a software created to control a contest with the ACM International + Collegiate Programming Contest rules. It has been developed in PHP and the + interaction between judges and the system is done through a web browser. + . + This package contains shared files with all BOCA packages. + +Package: boca-autojudge Architecture: amd64 -Depends: sharutils, wget, coreutils, libany-uri-escape-perl, openssl, openssh-server -Description: BOCA submission tools. - This package provides tools to submit codes to a running boca server - without using the web interface. +Depends: boca-common, debootstrap, schroot, quotatool, makepasswd +Description: BOCA - AutoJudge + BOCA is a software created to control a contest with the ACM International + Collegiate Programming Contest rules. It has been developed in PHP and the + interaction between judges and the system is done through a web browser. + . + This package contains files to generate and run the autojudge system for + BOCA. diff --git a/debian/postinst b/debian/postinst deleted file mode 100644 index 65e238f..0000000 --- a/debian/postinst +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -chown -R www-data.www-data /var/www/boca -chmod 4555 /usr/bin/safeexec - -service apache2 restart || true diff --git a/debian/rules b/debian/rules index 6c52a63..eedb9d1 100755 --- a/debian/rules +++ b/debian/rules @@ -3,8 +3,10 @@ override_dh_auto_install: mkdir -p debian/boca-submission-tools make -j1 install-submission-tools DESTDIR=debian/boca-submission-tools - mkdir -p debian/boca - make -j1 install DESTDIR=debian/boca + mkdir -p debian/boca-web + make -j1 install-bocaapache DESTDIR=debian/boca-web + mkdir -p debian/boca-autojudge + make -j1 install-bocaautojudge DESTDIR=debian/boca-autojudge %: dh $@ -- cgit v1.2.3 From d7ff880dfaa1f5462ee0cb0dd6260d236095a3e3 Mon Sep 17 00:00:00 2001 From: Bruno Cesar Ribas Date: Wed, 22 Aug 2018 00:38:15 -0300 Subject: tools/000-boca.conf: Adds configuration specific for php-fpm Signed-off-by: Bruno Cesar Ribas --- tools/000-boca.conf | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/000-boca.conf b/tools/000-boca.conf index 66c62fe..81df368 100644 --- a/tools/000-boca.conf +++ b/tools/000-boca.conf @@ -1,3 +1,12 @@ + + Require all granted + + + AddHandler php7-fcgi .php + Action php7-fcgi /php7-fcgi + Alias /php7-fcgi /usr/lib/cgi-bin/php7-fcgi + FastCgiExternalServer /usr/lib/cgi-bin/php7-fcgi -socket /var/run/php/php7.0-fpm.sock -idle-timeout 120 -pass-header Authorization + AllowOverride Options AuthConfig Limit Order Allow,Deny -- cgit v1.2.3 From 112a4ef283a8a2e7488c9964bcc4e70023ee8981 Mon Sep 17 00:00:00 2001 From: Bruno Cesar Ribas Date: Wed, 22 Aug 2018 00:39:52 -0300 Subject: .gitignore: updated accordingly Signed-off-by: Bruno Cesar Ribas --- .gitignore | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.gitignore b/.gitignore index 55a3aa5..a78607f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,16 @@ tools/boca-submit-run-root-wrapper tools/safeexec +debian/.debhelper/ +debian/boca-autojudge.substvars +debian/boca-autojudge/ +debian/boca-common.substvars +debian/boca-common/ +debian/boca-db.substvars +debian/boca-db/ +debian/boca-submission-tools/ +debian/boca-web.substvars +debian/boca-web/ +debian/boca.substvars +debian/boca/ +debian/debhelper-build-stamp +debian/files -- cgit v1.2.3 From 46f35d10395eb6f4c3132379ea397448f8a6533c Mon Sep 17 00:00:00 2001 From: Bruno Cesar Ribas Date: Wed, 22 Aug 2018 10:49:13 -0300 Subject: d/control: Remove php-mcrypt dependency php-mcrypt is deprecated and another cryptographic library should be used. Signed-off-by: Bruno Cesar Ribas --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index f3fdd17..9235bdf 100644 --- a/debian/control +++ b/debian/control @@ -40,7 +40,7 @@ Description: BOCA - WEB files Package: boca-common Architecture: all -Depends: php-zip, makepasswd, sharutils, wget, coreutils, php-cli, php-mcrypt, php-pgsql, php-gd, postgresql-client +Depends: php-zip, makepasswd, sharutils, wget, coreutils, php-cli, php-pgsql, php-gd, postgresql-client Description: BOCA - Common files BOCA is a software created to control a contest with the ACM International Collegiate Programming Contest rules. It has been developed in PHP and the -- cgit v1.2.3 From 3195e008a2ce7e0fa92766bb8cefdd182b98df9e Mon Sep 17 00:00:00 2001 From: Bruno Cesar Ribas Date: Wed, 22 Aug 2018 15:21:23 -0300 Subject: Makefile: Fix install-bocadb Signed-off-by: Bruno Cesar Ribas --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index a0280ca..683bf37 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,7 @@ install-scripts: install tools/dump.sh $(DESTDIR)/usr/sbin/boca-dump install-bocadb: + mkdir -p $(DESTDIR)/usr/sbin/ install tools/boca-createdb.sh $(DESTDIR)/usr/sbin/boca-createdb install-bocacommon: -- cgit v1.2.3 From efa3a56d8f745c574ce66ddec52ea02fc2c64684 Mon Sep 17 00:00:00 2001 From: Bruno Cesar Ribas Date: Wed, 22 Aug 2018 15:21:47 -0300 Subject: d/rules: Add bocadb and boca-common files Signed-off-by: Bruno Cesar Ribas --- debian/rules | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debian/rules b/debian/rules index eedb9d1..3453dd0 100755 --- a/debian/rules +++ b/debian/rules @@ -7,6 +7,10 @@ override_dh_auto_install: make -j1 install-bocaapache DESTDIR=debian/boca-web mkdir -p debian/boca-autojudge make -j1 install-bocaautojudge DESTDIR=debian/boca-autojudge + mkdir -p debian/boca-db + make -j1 install-bocadb DESTDIR=debian/boca-db + mkdir -p debian/boca-common + make -j1 install-bocacommon DESTDIR=debian/boca-common %: dh $@ -- cgit v1.2.3 From fec3098279220d067f72a3b386fd679c58e43899 Mon Sep 17 00:00:00 2001 From: Bruno Cesar Ribas Date: Wed, 22 Aug 2018 15:27:10 -0300 Subject: d/boca-web.postinst: Add commands to enable php-fpm Signed-off-by: Bruno Cesar Ribas --- debian/boca-web.postinst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/boca-web.postinst b/debian/boca-web.postinst index 18ce749..60899b7 100644 --- a/debian/boca-web.postinst +++ b/debian/boca-web.postinst @@ -7,5 +7,12 @@ chmod 4555 /usr/bin/safeexec a2ensite default-ssl a2enmod ssl a2enmod socache_shmcb +a2enmod proxy_fcgi + +# Make sure embedded apache php module is not loaded +a2dismod php7.2 || true + +#enable php fpm instead +a2enconf php7.2-fpm service apache2 restart || true -- cgit v1.2.3 From 2b7d34704dae513c2a1ff9a19ec7013d06913cd3 Mon Sep 17 00:00:00 2001 From: Bruno Cesar Ribas Date: Wed, 22 Aug 2018 15:54:54 -0300 Subject: d/boca-autojudge.postinst: Adds suid to safeexec Signed-off-by: Bruno Cesar Ribas --- debian/boca-autojudge.postinst | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 debian/boca-autojudge.postinst diff --git a/debian/boca-autojudge.postinst b/debian/boca-autojudge.postinst new file mode 100644 index 0000000..37b144c --- /dev/null +++ b/debian/boca-autojudge.postinst @@ -0,0 +1,5 @@ +#!/bin/bash + +chmod 4555 /usr/bin/safeexec + +exit 0 -- cgit v1.2.3 From 890961b390d76d45691a518bc1ff58b650af8c16 Mon Sep 17 00:00:00 2001 From: Bruno Cesar Ribas Date: Wed, 22 Aug 2018 15:55:20 -0300 Subject: d/boca-web.postinst: Remove line regarding safeexec safeexec is now part of boca-autojudge package Signed-off-by: Bruno Cesar Ribas --- debian/boca-web.postinst | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/boca-web.postinst b/debian/boca-web.postinst index 60899b7..49061af 100644 --- a/debian/boca-web.postinst +++ b/debian/boca-web.postinst @@ -2,7 +2,6 @@ chown -R www-data.www-data /var/www/boca chmod -R go-rwx /var/www/boca/src/private -chmod 4555 /usr/bin/safeexec a2ensite default-ssl a2enmod ssl -- cgit v1.2.3 From 97b57f14dee0a6ffb8b5f3c3e3397c86858c50c5 Mon Sep 17 00:00:00 2001 From: Bruno Cesar Ribas Date: Wed, 22 Aug 2018 15:56:08 -0300 Subject: d/control: Swap php and php-fpm dependency order This is done in order to avoid installation of libapache2-mod-php7.2. Signed-off-by: Bruno Cesar Ribas --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 9235bdf..a795ea3 100644 --- a/debian/control +++ b/debian/control @@ -30,7 +30,7 @@ Description: BOCA - database Package: boca-web Architecture: all -Depends: boca-common, apache2, php, php-fpm +Depends: boca-common, apache2, php-fpm, php Description: BOCA - WEB files BOCA is a software created to control a contest with the ACM International Collegiate Programming Contest rules. It has been developed in PHP and the -- cgit v1.2.3 From 45890a5029d0fb65cd2d15689c7c173cc0dae61b Mon Sep 17 00:00:00 2001 From: Bruno Cesar Ribas Date: Wed, 22 Aug 2018 15:57:52 -0300 Subject: tools/000-boca.conf: Update to match current apache2 guidelines Signed-off-by: Bruno Cesar Ribas --- tools/000-boca.conf | 45 +++++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/tools/000-boca.conf b/tools/000-boca.conf index 81df368..2ea68d9 100644 --- a/tools/000-boca.conf +++ b/tools/000-boca.conf @@ -1,24 +1,21 @@ - - Require all granted - - - AddHandler php7-fcgi .php - Action php7-fcgi /php7-fcgi - Alias /php7-fcgi /usr/lib/cgi-bin/php7-fcgi - FastCgiExternalServer /usr/lib/cgi-bin/php7-fcgi -socket /var/run/php/php7.0-fpm.sock -idle-timeout 120 -pass-header Authorization - - - AllowOverride Options AuthConfig Limit - Order Allow,Deny - Allow from all - AddDefaultCharset utf-8 - - - AllowOverride Options AuthConfig Limit - Deny from all - - - AllowOverride Options AuthConfig Limit - Deny from all - -Alias /boca /var/www/boca/src + + + ServerAdmin boca@bombonera.org + DocumentRoot /var/www/boca + + AllowOverride Options AuthConfig Limit + Order Allow,Deny + Allow from all + AddDefaultCharset utf-8 + + + AllowOverride Options AuthConfig Limit + Deny from all + + + AllowOverride Options AuthConfig Limit + Deny from all + + Alias /boca /var/www/boca/src + + -- cgit v1.2.3 From dc1451337d29d47b6312e23b6ad8391cc792e649 Mon Sep 17 00:00:00 2001 From: Bruno Cesar Ribas Date: Wed, 22 Aug 2018 16:12:24 -0300 Subject: src/.htaccess: Enable these conf when not on php-fpm Signed-off-by: Bruno Cesar Ribas --- src/.htaccess | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/.htaccess b/src/.htaccess index 7c89b5b..99fda17 100644 --- a/src/.htaccess +++ b/src/.htaccess @@ -1,5 +1,7 @@ -php_flag output_buffering on -php_value memory_limit 1024M -php_value post_max_size 128M -php_flag magic_quotes_gpc off -php_value upload_max_filesize 128M + + php_flag output_buffering on + php_value memory_limit 1024M + php_value post_max_size 128M + php_flag magic_quotes_gpc off + php_value upload_max_filesize 128M + -- cgit v1.2.3 From e9f46cd4aa43ee1b76faeed55f0eaf6945c237b7 Mon Sep 17 00:00:00 2001 From: Bruno Cesar Ribas Date: Wed, 22 Aug 2018 21:06:07 -0300 Subject: boca-common now holds all /var/www/boca files Files are too tightened to be separated for now. In a future release we will work to make things more independent. Signed-off-by: Bruno Cesar Ribas --- Makefile | 4 ++-- debian/boca-common.conffiles | 1 + debian/boca-web.conffiles | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 debian/boca-common.conffiles delete mode 100644 debian/boca-web.conffiles diff --git a/Makefile b/Makefile index 683bf37..ae49c78 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ install-bocawww: cp -r src $(DESTDIR)/var/www/boca/ cp -r doc $(DESTDIR)/var/www/boca/ -install-bocaapache: install-bocawww +install-bocaapache: mkdir -p $(DESTDIR)/etc/apache2/sites-enabled/ cp tools/000-boca.conf $(DESTDIR)/etc/apache2/sites-enabled/000-boca.conf a2ensite default-ssl || echo a2ensite default-ssl FAILED @@ -25,7 +25,7 @@ install-bocadb: mkdir -p $(DESTDIR)/usr/sbin/ install tools/boca-createdb.sh $(DESTDIR)/usr/sbin/boca-createdb -install-bocacommon: +install-bocacommon: install-bocawww mkdir -p $(DESTDIR)/usr/sbin/ mkdir -p $(DESTDIR)/etc/ cp tools/boca.conf $(DESTDIR)/etc/ diff --git a/debian/boca-common.conffiles b/debian/boca-common.conffiles new file mode 100644 index 0000000..b004c7a --- /dev/null +++ b/debian/boca-common.conffiles @@ -0,0 +1 @@ +/var/www/boca/src/private/conf.php diff --git a/debian/boca-web.conffiles b/debian/boca-web.conffiles deleted file mode 100644 index b004c7a..0000000 --- a/debian/boca-web.conffiles +++ /dev/null @@ -1 +0,0 @@ -/var/www/boca/src/private/conf.php -- cgit v1.2.3 From 2b3a3f47808b4024c703d4a4458f06483a8c40cb Mon Sep 17 00:00:00 2001 From: Bruno Cesar Ribas Date: Thu, 23 Aug 2018 10:11:09 -0300 Subject: install-bocadb: Installs files to postgresql Config files to postgresql are simply copied. When installing from Debian package it will prompt the user what to do with the pg_hba.conf Signed-off-by: Bruno Cesar Ribas --- Makefile | 2 + tools/postgresql/10/main/conf.d/000-boca.conf | 1 + tools/postgresql/10/main/pg_hba.conf | 101 ++++++++++++++++++++++++++ 3 files changed, 104 insertions(+) create mode 100644 tools/postgresql/10/main/conf.d/000-boca.conf create mode 100644 tools/postgresql/10/main/pg_hba.conf diff --git a/Makefile b/Makefile index ae49c78..db7c68c 100644 --- a/Makefile +++ b/Makefile @@ -23,6 +23,8 @@ install-scripts: install-bocadb: mkdir -p $(DESTDIR)/usr/sbin/ + mkdir -p $(DESTDIR)/etc + cp -r tools/postgresql $(DESTDIR)/etc install tools/boca-createdb.sh $(DESTDIR)/usr/sbin/boca-createdb install-bocacommon: install-bocawww diff --git a/tools/postgresql/10/main/conf.d/000-boca.conf b/tools/postgresql/10/main/conf.d/000-boca.conf new file mode 100644 index 0000000..128ef1a --- /dev/null +++ b/tools/postgresql/10/main/conf.d/000-boca.conf @@ -0,0 +1 @@ +listen_addresses = '*' diff --git a/tools/postgresql/10/main/pg_hba.conf b/tools/postgresql/10/main/pg_hba.conf new file mode 100644 index 0000000..4eeaa6e --- /dev/null +++ b/tools/postgresql/10/main/pg_hba.conf @@ -0,0 +1,101 @@ +# PostgreSQL Client Authentication Configuration File +# =================================================== +# +# Refer to the "Client Authentication" section in the PostgreSQL +# documentation for a complete description of this file. A short +# synopsis follows. +# +# This file controls: which hosts are allowed to connect, how clients +# are authenticated, which PostgreSQL user names they can use, which +# databases they can access. Records take one of these forms: +# +# local DATABASE USER METHOD [OPTIONS] +# host DATABASE USER ADDRESS METHOD [OPTIONS] +# hostssl DATABASE USER ADDRESS METHOD [OPTIONS] +# hostnossl DATABASE USER ADDRESS METHOD [OPTIONS] +# +# (The uppercase items must be replaced by actual values.) +# +# The first field is the connection type: "local" is a Unix-domain +# socket, "host" is either a plain or SSL-encrypted TCP/IP socket, +# "hostssl" is an SSL-encrypted TCP/IP socket, and "hostnossl" is a +# plain TCP/IP socket. +# +# DATABASE can be "all", "sameuser", "samerole", "replication", a +# database name, or a comma-separated list thereof. The "all" +# keyword does not match "replication". Access to replication +# must be enabled in a separate record (see example below). +# +# USER can be "all", a user name, a group name prefixed with "+", or a +# comma-separated list thereof. In both the DATABASE and USER fields +# you can also write a file name prefixed with "@" to include names +# from a separate file. +# +# ADDRESS specifies the set of hosts the record matches. It can be a +# host name, or it is made up of an IP address and a CIDR mask that is +# an integer (between 0 and 32 (IPv4) or 128 (IPv6) inclusive) that +# specifies the number of significant bits in the mask. A host name +# that starts with a dot (.) matches a suffix of the actual host name. +# Alternatively, you can write an IP address and netmask in separate +# columns to specify the set of hosts. Instead of a CIDR-address, you +# can write "samehost" to match any of the server's own IP addresses, +# or "samenet" to match any address in any subnet that the server is +# directly connected to. +# +# METHOD can be "trust", "reject", "md5", "password", "scram-sha-256", +# "gss", "sspi", "ident", "peer", "pam", "ldap", "radius" or "cert". +# Note that "password" sends passwords in clear text; "md5" or +# "scram-sha-256" are preferred since they send encrypted passwords. +# +# OPTIONS are a set of options for the authentication in the format +# NAME=VALUE. The available options depend on the different +# authentication methods -- refer to the "Client Authentication" +# section in the documentation for a list of which options are +# available for which authentication methods. +# +# Database and user names containing spaces, commas, quotes and other +# special characters must be quoted. Quoting one of the keywords +# "all", "sameuser", "samerole" or "replication" makes the name lose +# its special character, and just match a database or username with +# that name. +# +# This file is read on server startup and when the server receives a +# SIGHUP signal. If you edit the file on a running system, you have to +# SIGHUP the server for the changes to take effect, run "pg_ctl reload", +# or execute "SELECT pg_reload_conf()". +# +# Put your actual configuration here +# ---------------------------------- +# +# If you want to allow non-local connections, you need to add more +# "host" records. In that case you will also need to make PostgreSQL +# listen on a non-local interface via the listen_addresses +# configuration parameter, or via the -i or -h command line switches. + + + + +# DO NOT DISABLE! +# If you change this first entry you will need to make sure that the +# database superuser can access the database using some other method. +# Noninteractive access to all databases is required during automatic +# maintenance (custom daily cronjobs, replication, and similar tasks). +# +# Database administrative login by Unix domain socket +local all postgres peer + +# TYPE DATABASE USER ADDRESS METHOD + +# "local" is for Unix domain socket connections only +local all all peer +# IPv4 local connections: +host all all 127.0.0.1/32 md5 +# IPv6 local connections: +host all all ::1/128 md5 +# Allow replication connections from localhost, by a user with the +# replication privilege. +local replication all peer +host replication all 127.0.0.1/32 md5 +host replication all ::1/128 md5 +host bocadb bocauser 0/0 md5 +host postgres replication 0/0 md5 -- cgit v1.2.3 From 8e4d19dcd0b6d99e0e0f52f8b0a9bcd28a9de62a Mon Sep 17 00:00:00 2001 From: Bruno Cesar Ribas Date: Thu, 23 Aug 2018 11:07:38 -0300 Subject: debconf, makepasswd, coreutils, sharutils are now pre-depends of boca-common Signed-off-by: Bruno Cesar Ribas --- debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index a795ea3..d0e61ff 100644 --- a/debian/control +++ b/debian/control @@ -40,7 +40,8 @@ Description: BOCA - WEB files Package: boca-common Architecture: all -Depends: php-zip, makepasswd, sharutils, wget, coreutils, php-cli, php-pgsql, php-gd, postgresql-client +Pre-Depends: debconf, makepasswd, coreutils, sharutils +Depends: php-zip, wget, php-cli, php-pgsql, php-gd, postgresql-client Description: BOCA - Common files BOCA is a software created to control a contest with the ACM International Collegiate Programming Contest rules. It has been developed in PHP and the -- cgit v1.2.3 From 009899084bd9beb7f9a9f94925b60f194e0889a2 Mon Sep 17 00:00:00 2001 From: Bruno Cesar Ribas Date: Thu, 23 Aug 2018 11:30:54 -0300 Subject: d/control: Adds boca-submission-tools package Signed-off-by: Bruno Cesar Ribas --- debian/control | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/control b/debian/control index d0e61ff..3a5671b 100644 --- a/debian/control +++ b/debian/control @@ -59,3 +59,11 @@ Description: BOCA - AutoJudge . This package contains files to generate and run the autojudge system for BOCA. + +Package: boca-submission-tools +Architecture: amd64 +Depends: sharutils, wget, coreutils, libany-uri-escape-perl, openssl, openssh-server +Description: BOCA submission tools. + This package provides tools to submit codes to a running boca server + without using the web interface. + -- cgit v1.2.3 From 9afc0704ec837e6b3ef584ce0e66528b8a2cfa10 Mon Sep 17 00:00:00 2001 From: Bruno Cesar Ribas Date: Thu, 23 Aug 2018 11:31:42 -0300 Subject: d/boca-common.{postinst,templates}: Adds new postinst This version will prompt user for a DB hostname and password Signed-off-by: Bruno Cesar Ribas --- debian/boca-common.postinst | 43 +++++++++++++++++++++++++++++++++++++++++++ debian/boca-common.templates | 10 ++++++++++ 2 files changed, 53 insertions(+) create mode 100644 debian/boca-common.postinst create mode 100644 debian/boca-common.templates diff --git a/debian/boca-common.postinst b/debian/boca-common.postinst new file mode 100644 index 0000000..f6c61cd --- /dev/null +++ b/debian/boca-common.postinst @@ -0,0 +1,43 @@ +#!/bin/bash + +set -e + +. /usr/share/debconf/confmodule + +priority=high + +case "$1" in + configure|reconfigure) + db_input high boca-common/dbhost || true + db_go || true + + db_get boca-common/dbhost || true + DBHOST="$RET" + + if [[ "x$DBHOST" == "x" ]]; then + DBHOST=localhost + fi + + db_input high boca-common/dbpassword || true + db_go || true + + db_get boca-common/dbpassword || true + PASSWORD="$RET" + + if [[ "x$PASSWORD" == "x" ]]; then + printf "Generating password with makepasswd" + PASSWORD="$(makepasswd --chars 20)" + echo . + fi + export PASSWD="$PASSWORD" + boca-config-dbhost $DBHOST + unset PASSWD + ;; + *) + ;; +esac + +chmod 600 /var/www/boca/src/private/conf.php +chown www-data.www-data /var/www/boca/src/private/conf.php + +exit 0 diff --git a/debian/boca-common.templates b/debian/boca-common.templates new file mode 100644 index 0000000..e993675 --- /dev/null +++ b/debian/boca-common.templates @@ -0,0 +1,10 @@ +Template: boca-common/dbhost +Type: string +Default: localhost +Description: Please provide a host within BOCA database: + +Template: boca-common/dbpassword +Type: password +Description: Please provide a password for BOCA database: + Please, do not forget this password. You will need it to provide it while + configuring boca-web and boca-autojudge. -- cgit v1.2.3 From 70299e4fea03568965e14026e3bf810e9ed2ef08 Mon Sep 17 00:00:00 2001 From: Bruno Cesar Ribas Date: Thu, 23 Aug 2018 11:32:31 -0300 Subject: d/boca-web.posinst: Resets stored password in debconf This is a security measure to avoid DB password in multiple files Signed-off-by: Bruno Cesar Ribas --- debian/boca-web.postinst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/boca-web.postinst b/debian/boca-web.postinst index 49061af..52071f4 100644 --- a/debian/boca-web.postinst +++ b/debian/boca-web.postinst @@ -1,5 +1,7 @@ #!/bin/bash +. /usr/share/debconf/confmodule + chown -R www-data.www-data /var/www/boca chmod -R go-rwx /var/www/boca/src/private @@ -15,3 +17,8 @@ a2dismod php7.2 || true a2enconf php7.2-fpm service apache2 restart || true + +#remember to reset possible stored password from debconf +db_reset boca-common/dbpassword || true + +exit 0 -- cgit v1.2.3 From 59a32fa0c982c04d377be12d358c52bb08f1e421 Mon Sep 17 00:00:00 2001 From: Bruno Cesar Ribas Date: Thu, 23 Aug 2018 11:33:16 -0300 Subject: d/boca-db.{postinst,templates}: New postinst This postinst will prompt the user for a DB password and will configure postgresql accordingly Signed-off-by: Bruno Cesar Ribas --- debian/boca-db.postinst | 66 ++++++++++++++++++++++++++++++++++++++++++++++++ debian/boca-db.templates | 11 ++++++++ 2 files changed, 77 insertions(+) create mode 100644 debian/boca-db.postinst create mode 100644 debian/boca-db.templates diff --git a/debian/boca-db.postinst b/debian/boca-db.postinst new file mode 100644 index 0000000..8a36f55 --- /dev/null +++ b/debian/boca-db.postinst @@ -0,0 +1,66 @@ +#!/bin/bash + +set -e + +. /usr/share/debconf/confmodule + +priority=high + +case "$1" in + configure|reconfigure) + + #Assume DBHOST will be localhost, since this is the package that + #provides postgresql + #XXX future work make it work as a backup DB server + DBHOST=localhost + + db_get boca-common/dbpassword || true + PASSWORD="$RET" + + #If we don't have a password from boca-common 2 things could be + #happened + #1) dpkg cleaned the password already + #2) The user did not provide a password + #So we will ask for a password + if [[ "x$PASSWORD" == "x" ]]; then + db_input critical boca-db/dbpassword || true + db_go || true + db_get boca-db/dbpassword || true + PASSWORD="$RET" + db_reset boca-db/dbpassword + else + db_reset boca-common/dbpassword + fi + + if [[ "x$PASSWORD" == "x" ]]; then + printf "Generating password with makepasswd" + PASSWORD="$(makepasswd --chars 20)" + echo . + echo "Your DB password is '$PASSWORD' take care of it." + fi + export PASSWD="$PASSWORD" + boca-config-dbhost $DBHOST + unset PASSWD + postgresuser=postgres + su - $postgresuser -c "echo drop user bocauser | psql -d template1 >/dev/null 2>/dev/null" + su - $postgresuser -c "echo create user bocauser createdb password \'$PASSWORD\'| psql -d template1" + su - $postgresuser -c "echo alter user bocauser createdb password \'$PASSWORD\'| psql -d template1" + + db_input critical boca-db/createdb || true + db_go || true + + db_get boca-db/createdb || true + + if [[ "$RET" == "Yes" ]]; then + echo YES |php /var/www/boca/src/private/createdb.php + fi + db_reset boca-db/createdb + + ;; + *) + ;; +esac + +service postgresql restart || true + +exit 0 diff --git a/debian/boca-db.templates b/debian/boca-db.templates new file mode 100644 index 0000000..895098d --- /dev/null +++ b/debian/boca-db.templates @@ -0,0 +1,11 @@ +Template: boca-db/dbpassword +Type: password +Description: Please provide a password for BOCA database: + Please, do not forget this password. You will need it to provide it while + configuring boca-web and boca-autojudge. + +Template: boca-db/createdb +Type: select +Choices: Yes, No +Description: Should a new DB be created for BOCA? + Warning: This operation will erase any existing previously created BOCA DB -- cgit v1.2.3 From 5565fc2b57fd876f696e9ac5e8f9ba49d1e99eb9 Mon Sep 17 00:00:00 2001 From: Bruno Cesar Ribas Date: Thu, 23 Aug 2018 11:34:40 -0300 Subject: boca-{config-dbhost,createdb}.sh: updated to new package schema From now on these scripts are mainly run by d/*postinst whiule configuring. A user may call it but it is not recommended. Signed-off-by: Bruno Cesar Ribas --- tools/boca-config-dbhost.sh | 34 ++++++++++++++++++--------------- tools/boca-createdb.sh | 46 +-------------------------------------------- 2 files changed, 20 insertions(+), 60 deletions(-) diff --git a/tools/boca-config-dbhost.sh b/tools/boca-config-dbhost.sh index 306f44f..bfe710e 100644 --- a/tools/boca-config-dbhost.sh +++ b/tools/boca-config-dbhost.sh @@ -35,6 +35,8 @@ bdservernew=$1 . /etc/boca.conf +privatedir=$bocadir/src/private + CHANGE=n if [[ "x$bdserver" == "x" ]]; then echo "bdserver=$bdservernew" >> /etc/boca.conf @@ -46,21 +48,23 @@ fi bdserver=$bdservernew -if [[ "$bdserver" == "localhost" && "x$bdcreated" != "xy" ]]; then - if [[ "$CHANGE" == "n" ]]; then - boca-createdb - else - boca-createdb -f - fi -elif [[ "$bdserver" != "localhost" ]]; then - printf "You will be asked to prompt the BD password [enter do continue]" - read - #just to config password - if [[ "$CHANGE" == "n" ]]; then - boca-createdb nocreate - else - boca-createdb -f nocreate - fi +#update conf.php +# PASSWD should be environment defined. While installing boca-common package +# this variable will be set +PASS=$PASSWD +if [[ "x$PASS" == "x" ]]; then + read -p "Enter DB password: " -s PASS fi +PASSK=`makepasswd --chars 20` +awk -v boca="$bdserver" -v pass="$PASS" -v passk="$PASSK" '{ if(index($0,"[\"dbpass\"]")>0) \ + print "$conf[\"dbpass\"]=\"" pass "\";"; \ + else if(index($0,"[\"dbhost\"]")>0) print "$conf[\"dbhost\"]=\"" boca "\";"; \ + else if(index($0,"[\"dbsuperpass\"]")>0) print "$conf[\"dbsuperpass\"]=\"" pass "\";"; \ + else if(index($0,"[\"key\"]")>0) print "$conf[\"key\"]=\"" passk "\";"; else print $0; }' \ + < $privatedir/conf.php > $privatedir/conf.php1 +mv -f $privatedir/conf.php1 $privatedir/conf.php + +chown www-data.www-data $privatedir/conf.php +chmod 600 $privatedir/conf.php exit 0 diff --git a/tools/boca-createdb.sh b/tools/boca-createdb.sh index c230819..0c36a3f 100644 --- a/tools/boca-createdb.sh +++ b/tools/boca-createdb.sh @@ -37,7 +37,7 @@ privatedir=$bocadir/src/private postgresuser=postgres if [[ "x$bdserver" == "x" ]]; then - echo "Please run boca-config-dbhost" + echo "Please run boca-config-dbhost first" exit 2 fi @@ -57,54 +57,10 @@ if [[ "x$bdcreated" == "x" || "$1" == "-f" ]] ; then fi echo "Keep the DB password safe!" - PASSK=`makepasswd --chars 20` - awk -v boca="$bdserver" -v pass="$PASS" -v passk="$PASSK" '{ if(index($0,"[\"dbpass\"]")>0) \ - print "$conf[\"dbpass\"]=\"" pass "\";"; \ - else if(index($0,"[\"dbhost\"]")>0) print "$conf[\"dbhost\"]=\"" boca "\";"; \ - else if(index($0,"[\"dbsuperpass\"]")>0) print "$conf[\"dbsuperpass\"]=\"" pass "\";"; \ - else if(index($0,"[\"key\"]")>0) print "$conf[\"key\"]=\"" passk "\";"; else print $0; }' \ - < $privatedir/conf.php > $privatedir/conf.php1 - mv -f $privatedir/conf.php1 $privatedir/conf.php - if [[ "$bdserver" == "localhost" ]]; then su - $postgresuser -c "echo drop user bocauser | psql -d template1 >/dev/null 2>/dev/null" su - $postgresuser -c "echo create user bocauser createdb password \'$PASS\'| psql -d template1" su - $postgresuser -c "echo alter user bocauser createdb password \'$PASS\'| psql -d template1" - #allowing outside connections - if ! echo "$*" | grep -q notouchpgconf; then - echo "##########################" - echo " ATENTION" - echo "##########################" - echo - echo "I AM GIVING ACCESS TO THE DATABASE FROM ANY IP (AS LONG AS THE PASSWORD IS OK)" - CONTINUE="y" - printf "May I give access? [Y/n]" - read CONTINUE - - if [[ "$CONTINUE" == "Y" || "$CONTINUE" == "y" ]]; then - for i in /etc/postgresql/*/main/pg_hba.conf; do - if grep -q "host.*bocadb.*bocauser" $i; then - continue; - fi - echo "host bocadb bocauser 0/0 md5" >> $i - echo "host postgres replication 0/0 md5" >> $i - done - for i in /etc/postgresql/*/main/postgresql.conf; do - if ! grep -q "^[^\#]*listen_addresses" $i; then - echo "listen_addresses = '*'" >> $i - fi - done - service postgresql restart - - else - echo "#### READ THIS ####" - echo "If you change your mind later, you may call me again as:" - echo "$0 -f" - sleep 3 - echo - echo - fi - fi fi if [[ "x$bdcreated" == "x" ]]; then echo 'bdcreated=y' >> /etc/boca.conf -- cgit v1.2.3 From 9f05ae47d104864162f264fe6415d73797e039bd Mon Sep 17 00:00:00 2001 From: Bruno Cesar Ribas Date: Thu, 23 Aug 2018 23:25:23 -0300 Subject: d/boca-{common,db}.postinst: Avoid asking same question on upgrade From now on the user must remove lines containing 'bdserver' or 'bdcreated in /etc/boca.conf in order to modify the DB password and the DB hostname. Signed-off-by: Bruno Cesar Ribas --- debian/boca-common.postinst | 7 +++++++ debian/boca-db.postinst | 9 +++++++++ 2 files changed, 16 insertions(+) diff --git a/debian/boca-common.postinst b/debian/boca-common.postinst index f6c61cd..d28de8a 100644 --- a/debian/boca-common.postinst +++ b/debian/boca-common.postinst @@ -8,6 +8,13 @@ priority=high case "$1" in configure|reconfigure) + if [[ -e "/etc/boca.conf" ]]; then + . /etc/boca.conf + if [[ "$bdserver" != "" ]]; then + echo "If you want to reset DB configuration, please unset \"bdserver\" in /etc/boca.conf" + exit 0 + fi + fi db_input high boca-common/dbhost || true db_go || true diff --git a/debian/boca-db.postinst b/debian/boca-db.postinst index 8a36f55..c4215df 100644 --- a/debian/boca-db.postinst +++ b/debian/boca-db.postinst @@ -9,6 +9,14 @@ priority=high case "$1" in configure|reconfigure) + if [[ -e "/etc/boca.conf" ]]; then + . /etc/boca.conf + if [[ "$bdcreated" != "" ]]; then + echo "If you want to reset DB configuration, please unset \"bdcreated\" in /etc/boca.conf" + exit 0 + fi + fi + #Assume DBHOST will be localhost, since this is the package that #provides postgresql #XXX future work make it work as a backup DB server @@ -53,6 +61,7 @@ case "$1" in if [[ "$RET" == "Yes" ]]; then echo YES |php /var/www/boca/src/private/createdb.php + echo "bdcreated=y" >> /etc/boca.conf fi db_reset boca-db/createdb -- cgit v1.2.3