Change Sig Path

This commit is contained in:
Mike Reeves
2020-11-11 15:37:11 -05:00
parent 3a622ee71e
commit 8512042132

View File

@@ -876,61 +876,61 @@ docker_seed_registry() {
if ! [ -f /nsm/docker-registry/docker/registry.tar ]; then if ! [ -f /nsm/docker-registry/docker/registry.tar ]; then
if [ "$install_type" == 'IMPORT' ]; then if [ "$install_type" == 'IMPORT' ]; then
local TRUSTED_CONTAINERS=(\ local TRUSTED_CONTAINERS=(\
"so-idstools:$VERSION" \ "so-idstools" \
"so-nginx:$VERSION" \ "so-nginx" \
"so-filebeat:$VERSION" \ "so-filebeat" \
"so-suricata:$VERSION" \ "so-suricata" \
"so-soc:$VERSION" \ "so-soc" \
"so-steno:$VERSION" \ "so-steno" \
"so-elasticsearch:$VERSION" \ "so-elasticsearch" \
"so-kibana:$VERSION" \ "so-kibana" \
"so-kratos:$VERSION" \ "so-kratos" \
"so-suricata:$VERSION" \ "so-suricata" \
"so-pcaptools:$VERSION" \ "so-pcaptools" \
"so-zeek:$VERSION" "so-zeek"
) )
else else
local TRUSTED_CONTAINERS=(\ local TRUSTED_CONTAINERS=(\
"so-nginx:$VERSION" \ "so-nginx" \
"so-filebeat:$VERSION" \ "so-filebeat" \
"so-logstash:$VERSION" \ "so-logstash" \
"so-idstools:$VERSION" \ "so-idstools" \
"so-redis:$VERSION" \ "so-redis" \
"so-steno:$VERSION" \ "so-steno" \
"so-suricata:$VERSION" \ "so-suricata" \
"so-telegraf:$VERSION" \ "so-telegraf" \
"so-zeek:$VERSION" "so-zeek"
) )
fi fi
if [ "$install_type" != 'HELIXSENSOR' ] && [ "$install_type" != 'IMPORT' ]; then if [ "$install_type" != 'HELIXSENSOR' ] && [ "$install_type" != 'IMPORT' ]; then
TRUSTED_CONTAINERS=("${TRUSTED_CONTAINERS[@]}" \ TRUSTED_CONTAINERS=("${TRUSTED_CONTAINERS[@]}" \
"so-acng:$VERSION" \ "so-acng" \
"so-thehive-cortex:$VERSION" \ "so-thehive-cortex" \
"so-curator:$VERSION" \ "so-curator" \
"so-domainstats:$VERSION" \ "so-domainstats" \
"so-elastalert:$VERSION" \ "so-elastalert" \
"so-elasticsearch:$VERSION" \ "so-elasticsearch" \
"so-fleet:$VERSION" \ "so-fleet" \
"so-fleet-launcher:$VERSION" \ "so-fleet-launcher" \
"so-freqserver:$VERSION" \ "so-freqserver" \
"so-grafana:$VERSION" \ "so-grafana" \
"so-influxdb:$VERSION" \ "so-influxdb" \
"so-kibana:$VERSION" \ "so-kibana" \
"so-minio:$VERSION" \ "so-minio" \
"so-mysql:$VERSION" \ "so-mysql" \
"so-pcaptools:$VERSION" \ "so-pcaptools" \
"so-playbook:$VERSION" \ "so-playbook" \
"so-soc:$VERSION" \ "so-soc" \
"so-kratos:$VERSION" \ "so-kratos" \
"so-soctopus:$VERSION" \ "so-soctopus" \
"so-steno:$VERSION" \ "so-steno" \
"so-strelka-frontend:$VERSION" \ "so-strelka-frontend" \
"so-strelka-manager:$VERSION" \ "so-strelka-manager" \
"so-strelka-backend:$VERSION" \ "so-strelka-backend" \
"so-strelka-filestream:$VERSION" \ "so-strelka-filestream" \
"so-thehive:$VERSION" \ "so-thehive" \
"so-thehive-es:$VERSION" \ "so-thehive-es" \
"so-wazuh:$VERSION" "so-wazuh"
) )
fi fi
local percent=25 local percent=25
@@ -946,19 +946,19 @@ docker_seed_registry() {
for i in "${TRUSTED_CONTAINERS[@]}"; do for i in "${TRUSTED_CONTAINERS[@]}"; do
if [ "$install_type" != 'HELIXSENSOR' ]; then ((percent=percent+1)); else ((percent=percent+6)); fi if [ "$install_type" != 'HELIXSENSOR' ]; then ((percent=percent+1)); else ((percent=percent+6)); fi
# Pull down the trusted docker image # Pull down the trusted docker image
set_progress_str "$percent" "Downloading $i" set_progress_str "$percent" "Downloading $i:$VERSION"
{ {
echo "Downloading $i" echo "Downloading $i"
docker pull $CONTAINER_REGISTRY/$IMAGEREPO/$i docker pull $CONTAINER_REGISTRY/$IMAGEREPO/$i:$VERSION
# Get signature # Get signature
curl https://raw.githubusercontent.com/Security-Onion-Solutions/securityonion/$BRANCH/sigs/images/$i.sig --output $SIGNPATH/$i.gpg curl https://raw.githubusercontent.com/Security-Onion-Solutions/securityonion/$BRANCH/sigs/images/$VERSION/$i.sig --output $SIGNPATH/$i.gpg
if [[ $? -ne 0 ]]; then if [[ $? -ne 0 ]]; then
echo "Unable to pull signature file for $i" echo "Unable to pull signature file for $i:$VERSION"
exit 1 exit 1
fi fi
# Dump our hash values # Dump our hash values
docker inspect $CONTAINER_REGISTRY/$IMAGEREPO/$i | jq '.[0].Created, .[0].RepoDigests, .[0].Size, .[0].RootFS.Layers' > $SIGNPATH/$i.txt docker inspect $CONTAINER_REGISTRY/$IMAGEREPO/$i:$VERSION | jq '.[0].Created, .[0].RepoDigests, .[0].Size, .[0].RootFS.Layers' > $SIGNPATH/$i.txt
if [[ $? -ne 0 ]]; then if [[ $? -ne 0 ]]; then
echo "Unable to inspect $i" echo "Unable to inspect $i"
exit 1 exit 1
@@ -966,8 +966,8 @@ docker_seed_registry() {
GPGTEST=$(gpg --verify $SIGNPATH/$i.sig $SIGNPATH/$i.txt 2>&1) GPGTEST=$(gpg --verify $SIGNPATH/$i.sig $SIGNPATH/$i.txt 2>&1)
if [[ $? -eq 0 ]]; then if [[ $? -eq 0 ]]; then
# Tag it with the new registry destination # Tag it with the new registry destination
docker tag $CONTAINER_REGISTRY/$IMAGEREPO/$i $HOSTNAME:5000/$IMAGEREPO/$i docker tag $CONTAINER_REGISTRY/$IMAGEREPO/$i:$VERSION $HOSTNAME:5000/$IMAGEREPO/$i:$VERSION
docker push $HOSTNAME:5000/$IMAGEREPO/$i docker push $HOSTNAME:5000/$IMAGEREPO/$i:$VERSION
else else
echo "There is a problem downloading the $i image. Details: " echo "There is a problem downloading the $i image. Details: "
echo "" echo ""