faerbit/archiso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mkarchiso: check if the code signing files specified with option -c exist

Browse Source 
Look for the files in `*_validate_options` and error out early if they do
not exist.
This commit is contained in:
nl6720 2022-11-26 21:18:15 +02:00
parent 2c3420204e
commit 2da65f64ad
No known key found for this signature in database
GPG Key ID: 5CE88535E188D369
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.rst
View File

@ -15,6 +15,7 @@ Changed
- Check if the GPG public key file was successfully placed in the work directory before trying to use it. - Check if the GPG public key file was successfully placed in the work directory before trying to use it.
- Open the file descriptors for code signing certificates and GPG public key as read only. Nothing from the within the - Open the file descriptors for code signing certificates and GPG public key as read only. Nothing from the within the
``pacstrap`` invoked chroot should ever be allowed to write outside of it. ``pacstrap`` invoked chroot should ever be allowed to write outside of it.
- Error out early if any of the code signing certificate files passed with option ``-c`` do not exist.
Removed Removed
------- -------

10
archiso/mkarchiso
View File

@ -1522,7 +1522,7 @@ _read_profile() {
# Validate set options # Validate set options
_validate_options() { _validate_options() {
local validation_error=0 _buildmode local validation_error=0 _buildmode certfile
_msg_info "Validating options..." _msg_info "Validating options..."
@ -1532,6 +1532,14 @@ _validate_options() {
_msg_error "File '${pacman_conf}' does not exist." 0 _msg_error "File '${pacman_conf}' does not exist." 0
fi fi
# Check if the code signing certificate files exist
for certfile in "${cert_list[@]}"; do
if [[ ! -e "$certfile" ]]; then
(( validation_error=validation_error+1 ))
_msg_error "Code signing certificate '${certfile}' does not exist." 0
fi
done
# Check if the specified buildmodes are supported # Check if the specified buildmodes are supported
for _buildmode in "${buildmodes[@]}"; do for _buildmode in "${buildmodes[@]}"; do
if typeset -f "_build_buildmode_${_buildmode}" &> /dev/null; then if typeset -f "_build_buildmode_${_buildmode}" &> /dev/null; then