Add support for upload handlers and implement brep-upload-bindist handler

3 files changed, 166 insertions, 9 deletions

diff --git a/etc/brep-module.conf b/etc/brep-module.conf
index 31e3e11..ece1a05 100644
--- a/etc/brep-module.conf
+++ b/etc/brep-module.conf
@@ -260,6 +260,24 @@ menu About=?about
 # build-db-retry 10
 
 
+# The root directory where the uploaded binary distribution artifacts are
+# saved to under the following directory hierarchy:
+#
+# [<tenant>/]<distribution>/<os-release>/<project>/<package>/<version>/<package-config>
+#
+# The package configuration directory symlinks at these paths are displayed as
+# web links on the package version details page. If specified, then
+# bindist-url must be specified as well.
+#
+# bindist-root
+
+
+# The URL of the directory specified with the bindist-root option. Must be
+# specified if bindist-root is specified.
+#
+# bindist-url
+
+
 # The openssl program to be used for crypto operations. You can also specify
 # additional options that should be passed to the openssl program with
 # openssl-option. If the openssl program is not explicitly specified, then brep
@@ -336,10 +354,9 @@ menu About=?about
 
 
 # The handler program to be executed on package submission. The handler is
-# executed as part of the submission request and is passed additional
-# arguments that can be specified with submit-handler-argument followed by
-# the absolute path to the submission directory. Note that the program path
-# must be absolute.
+# executed as part of the HTTP request and is passed additional arguments that
+# can be specified with submit-handler-argument followed by the absolute path
+# to the submission directory. Note that the program path must be absolute.
 #
 # submit-handler
 
@@ -403,6 +420,66 @@ menu About=?about
 # ci-handler-timeout
 
 
+# The directory to save upload data to for the specified upload type. If
+# unspecified, the build artifacts upload functionality will be disabled for
+# this type.
+#
+# Note that the directory path must be absolute and the directory itself must
+# exist and have read, write, and execute permissions granted to the user that
+# runs the web server.
+#
+# upload-data <type>=<dir>
+
+
+# The maximum size of the upload data accepted for the specified upload type.
+# Note that currently the entire upload request is read into memory. The
+# default is 10M.
+#
+# upload-max-size <type>=10485760
+
+
+# The build artifacts upload email. If specified, the upload request and
+# result manifests will be sent to this address.
+#
+# upload-email <type>=<email>
+
+
+# The handler program to be executed on build artifacts upload of the
+# specified type. The handler is executed as part of the HTTP request and is
+# passed additional arguments that can be specified with
+# upload-handler-argument followed by the absolute path to the upload
+# directory. Note that the program path must be absolute.
+#
+# upload-handler <type>=<path>
+
+
+# Additional arguments to be passed to the upload handler program for the
+# specified upload type (see upload-handler for details). Repeat this option
+# to specify multiple arguments.
+#
+# upload-handler-argument <type>=<arg>
+
+
+# The upload handler program timeout in seconds for the specified upload type.
+# If specified and the handler does not exit in the allotted time, then it is
+# killed and its termination is treated as abnormal.
+#
+# upload-handler-timeout <type>=<seconds>
+
+
+# Disable upload of the specified type for the specified toolchain name.
+# Repeat this option to disable uploads for multiple toolchains.
+#
+# upload-toolchain-exclude <type>=<name>
+
+
+# Disable upload of the specified type for packages from the repository with
+# the specified canonical name. Repeat this option to disable uploads for
+# multiple repositories.
+#
+# upload-repository-exclude <type>=<name>
+
+
 # The default view to display for the global repository root. The value is one
 # of the supported services (packages, builds, submit, ci, etc). Default is
 # packages.
diff --git a/etc/private/install/brep-module.conf b/etc/private/install/brep-module.conf
index 832b8c1..525316d 100644
--- a/etc/private/install/brep-module.conf
+++ b/etc/private/install/brep-module.conf
@@ -260,6 +260,24 @@ menu About=?about
 # build-db-retry 10
 
 
+# The root directory where the uploaded binary distribution artifacts are
+# saved to under the following directory hierarchy:
+#
+# [<tenant>/]<distribution>/<os-release>/<project>/<package>/<version>/<package-config>
+#
+# The package configuration directory symlinks at these paths are displayed as
+# web links on the package version details page. If specified, then
+# bindist-url must be specified as well.
+#
+# bindist-root
+
+
+# The URL of the directory specified with the bindist-root option. Must be
+# specified if bindist-root is specified.
+#
+# bindist-url
+
+
 # The openssl program to be used for crypto operations. You can also specify
 # additional options that should be passed to the openssl program with
 # openssl-option. If the openssl program is not explicitly specified, then brep
@@ -338,10 +356,9 @@ submit-form /home/brep/install/share/brep/www/submit.xhtml
 
 
 # The handler program to be executed on package submission. The handler is
-# executed as part of the submission request and is passed additional
-# arguments that can be specified with submit-handler-argument followed by
-# the absolute path to the submission directory. Note that the program path
-# must be absolute.
+# executed as part of the HTTP request and is passed additional arguments that
+# can be specified with submit-handler-argument followed by the absolute path
+# to the submission directory. Note that the program path must be absolute.
 #
 submit-handler /home/brep/install/bin/brep-submit-pub
 
@@ -411,6 +428,66 @@ submit-handler-timeout 120
 # ci-handler-timeout
 
 
+# The directory to save upload data to for the specified upload type. If
+# unspecified, the build artifacts upload functionality will be disabled for
+# this type.
+#
+# Note that the directory path must be absolute and the directory itself must
+# exist and have read, write, and execute permissions granted to the user that
+# runs the web server.
+#
+# upload-data <type>=<dir>
+
+
+# The maximum size of the upload data accepted for the specified upload type.
+# Note that currently the entire upload request is read into memory. The
+# default is 10M.
+#
+# upload-max-size <type>=10485760
+
+
+# The build artifacts upload email. If specified, the upload request and
+# result manifests will be sent to this address.
+#
+# upload-email <type>=<email>
+
+
+# The handler program to be executed on build artifacts upload of the
+# specified type. The handler is executed as part of the HTTP request and is
+# passed additional arguments that can be specified with
+# upload-handler-argument followed by the absolute path to the upload
+# directory. Note that the program path must be absolute.
+#
+# upload-handler <type>=<path>
+
+
+# Additional arguments to be passed to the upload handler program for the
+# specified upload type (see upload-handler for details). Repeat this option
+# to specify multiple arguments.
+#
+# upload-handler-argument <type>=<arg>
+
+
+# The upload handler program timeout in seconds for the specified upload type.
+# If specified and the handler does not exit in the allotted time, then it is
+# killed and its termination is treated as abnormal.
+#
+# upload-handler-timeout <type>=<seconds>
+
+
+# Disable upload of the specified type for the specified toolchain name.
+# Repeat this option to disable uploads for multiple toolchains.
+#
+# upload-toolchain-exclude <type>=<name>
+
+
+# Disable upload of the specified type for packages from the repository with
+# the specified canonical name. Repeat this option to disable uploads for
+# multiple repositories.
+#
+# upload-repository-exclude <type>=<name>
+
+
 # The default view to display for the global repository root. The value is one
 # of the supported services (packages, builds, submit, ci, etc). Default is
 # packages.
diff --git a/etc/systemd/brep-clean.service b/etc/systemd/brep-clean.service
index 739a54a..d2e5630 100644
--- a/etc/systemd/brep-clean.service
+++ b/etc/systemd/brep-clean.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=brep build database cleaner service
+Description=brep build database and artifacts cleaner service
 
 [Service]
 Type=oneshot
@@ -7,9 +7,12 @@ Type=oneshot
 #Group=brep
 
 # Run both tenants and builds cleaners if CI request functionality is enabled.
+# Also run outdated build artifacts cleaners if build artifacts upload
+# functionality is enabled.
 #
 #ExecStart=/home/brep/install/bin/brep-clean tenants 240
 ExecStart=/home/brep/install/bin/brep-clean builds /home/brep/config/buildtab
+#ExecStart=/home/brep/install/bin/brep-upload-bindist-clean /var/bindist 2880
 
 [Install]
 WantedBy=default.target