Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Compatibility with BSD date #1

Merged
merged 8 commits into from
Mar 31, 2024
Merged

Compatibility with BSD date #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d7c329e
Compatibility with macOS shell
gamma Mar 5, 2024
891ffec
Apply suggestions from code review
oh2fih Mar 5, 2024
0c24602
Replace tr with awk
oh2fih Mar 5, 2024
7342c6c
Fix SC2015
oh2fih Mar 5, 2024
d277a18
Require Bash >= 4.0
oh2fih Mar 31, 2024
b3fb094
Detect non-GNU date instead of MacOS
oh2fih Mar 31, 2024
e02cbc3
Revert back to Parameter Expansion
oh2fih Mar 31, 2024
f4e3d8a
Update README.md
oh2fih Mar 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ This command line tool (Bash script) helps building RFC 9116 compliant, valid
& well formatted security.txt files as well as automating the PGP signing &
expire date updating process.

Requires Bash >= 4.0. Compatible with both GNU coreutils & BSD `date`.

### Usage

```bash
Expand Down
57 changes: 46 additions & 11 deletions securitytxt-signer.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,12 @@ required_command() {

UNMET=0

if ((BASH_VERSINFO[0] < 4)); then
echo -e "\033[0;31mThis script requires bash >= 4.0\033[0m" >&2
echo -e "\033[0;31mYour bash ${BASH_VERSION} is unsupported.\033[0m" >&2
((UNMET=UNMET+1))
fi

required_command "sed"
required_command "awk"
required_command "grep"
Expand All @@ -67,6 +73,15 @@ if [ "$UNMET" -gt 0 ]; then
exit 1
fi

# Compatibility for non-GNU date

if date --version >/dev/null 2>&1; then
GNU_DATE=1
else
echo -e "\033[0;33mIn compatibility mode for non-GNU date command.\033[0m" >&2
GNU_DATE=0
fi

shopt -s nocasematch

# Validate the PGP key.
Expand All @@ -77,14 +92,25 @@ if ! [[ "$KEY" =~ ^0x[a-fA-F0-9]{8,40}$ ]]; then
else
KEY_INFO=$(gpg --list-secret-keys "$KEY" 2> >(sed $'s,.*,\e[33m&\e[m,'>&2))

KEY_EXPIRES=$(
echo "$KEY_INFO" \
| grep "sec" \
| grep -Eo 'expires:\ [0-9\-]+' \
| awk '{ print $2}' \
| date -Iseconds -u -f - \
| sed -e 's/+00:00$/Z/'
)
if (( GNU_DATE )); then
KEY_EXPIRES=$(
echo "$KEY_INFO" \
| grep "sec" \
| grep -Eo 'expires:\ [0-9\-]+' \
| awk '{ print $2}' \
| date -Iseconds -u -f - \
| sed -e 's/+00:00$/Z/'
)
else
KEY_EXPIRES=$(
echo "$KEY_INFO" \
| grep "sec" \
| grep -Eo 'expires:\ [0-9\-]+' \
| awk '{ print $2}' \
| date -Iseconds -u \
| sed -e 's/+00:00$/Z/'
)
fi
echo

if [[ "$KEY_EXPIRES" = "" ]]; then
Expand Down Expand Up @@ -115,13 +141,22 @@ fi
# Set expire date.
# If the key expires before the DAYS_MAX, use the key expiration date instead.

EXPIRES=$(date -Iseconds -u -d "${DAYS_MAX} days" | sed -e 's/+00:00$/Z/')
if (( GNU_DATE )); then
EXPIRES=$(date -Iseconds -u -d "${DAYS_MAX} days" | sed -e 's/+00:00$/Z/')
else
EXPIRES=$(date -Iseconds -u -v+${DAYS_MAX}d | sed -e 's/+00:00$/Z/')
fi

if [ -z ${KEY_EXPIRES+x} ]; then
echo -e "\033[0;33mUSING EXPIRE (max ${DAYS_MAX} days): $EXPIRES\033[0;0m"
else
EXPIRES_COMPARABLE=$(date -d "$EXPIRES" +%s)
KEY_EXPIRES_COMPARABLE=$(date -d "$KEY_EXPIRES" +%s)
if (( GNU_DATE )); then
EXPIRES_COMPARABLE=$(date -d "$EXPIRES" +%s)
KEY_EXPIRES_COMPARABLE=$(date -d "$KEY_EXPIRES" +%s)
else
EXPIRES_COMPARABLE=$(date -j -f "%Y-%m-%dT%H:%M:%SZ" "$EXPIRES" +%s)
KEY_EXPIRES_COMPARABLE=$(date -j -f "%Y-%m-%dT%H:%M:%SZ" "$KEY_EXPIRES" +%s)
fi

echo -e "\033[0;33mComparing ${EXPIRES} to key expr ${KEY_EXPIRES}.\033[0;0m"

Expand Down
Loading