evolix
/
evobackup
18
0
Fork 1
Code Issues 27 Pull Requests 6 Releases 18 Activity

Merge branch 'fixes-43'

This commit is contained in:
Jérémy Lecour 2021-02-08 14:18:36 +01:00 committed by Jérémy Lecour
parent a41eb2a218 3215ab2fa3
commit 34de467b00
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -12,6 +12,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
* bkctld-check-incs: Correct shellsheck warnings
### Deprecated
### Removed
@ -19,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
* tests: clean jail configuration after each test
* bkctld-check-incs: Protect `jail_config_epoch`
### Security

14
lib/bkctld-check-incs
View File

@ -7,7 +7,7 @@
set -u
# shellcheck source=./includes
LIBDIR="$(dirname $0)" && . "${LIBDIR}/includes"
LIBDIR="$(dirname "$0")" && . "${LIBDIR}/includes"
# default return value is 0 (succes)
rc=0
@ -20,14 +20,14 @@ for jail_name in $("${LIBDIR}/bkctld-list"); do
# Today in ISO format
today_iso=$(date +"%Y-%m-%d")
# get jail last configuration date
jail_config_epoch=$(date --date "$(stat -c %y ${incs_policy_file})" +"%s")
if [ -n "${incs_policy_file}" ]; then
# loop for each line in jail configuration
for line in $(cat ${incs_policy_file}); do
# get jail last configuration date
jail_config_epoch=$(date --date "$(stat -c %y "${incs_policy_file}")" +"%s")
# read each line in jail configuration
while IFS= read -r line < "${incs_policy_file}"; do
# inc date in ISO format
inc_iso=$(relative_date ${line})
inc_iso=$(relative_date "${line}")
# inc date in seconds from epoch
inc_epoch=$(date --date "${inc_iso}" +"%s")