Waitlist script (#573)

* bash refactoring

* add storj.sh and user.sh

* reformat/refactor

* formatting

* fix typo

scripts/cert-gating.sh

@@ -1,4 +1,5 @@
-#!/bin/bash
+#!/usr/bin/env bash
+source $(dirname $0)/utils.sh
 basepath=$HOME/.storj/capt
 alpha_config=$basepath/config-alpha.yaml
 unauthorized_config=$basepath/config-unauthorized.yaml
@@ -7,11 +8,12 @@ ca_count=5
 ca_basepath=$basepath/ca-alpha-
 
 ca_i_basepath() {
-    echo "$ca_basepath$1"
+	echo ${ca_basepath}${1}
 }
+
 rand_ca_basepath() {
 	let i="($RANDOM % $ca_count) + 1"
-  echo $(ca_i_basepath $i)
+	echo $(ca_i_basepath ${i})
 }
 
 case $1 in
@@ -19,57 +21,62 @@ case $1 in
 		echo "usage: $(basename $0) [setup|alpha|unauthorized]"
 	;;
 	setup)
+		temp_build captplanet identity
 		echo "setting up captplanet"
-	captplanet setup --overwrite
+		"$captplanet" setup --overwrite
 		echo "clearing whitelist"
-    echo > $ca_whitelist
+		echo > ${ca_whitelist}
 		echo -n "generating alpha certificate authorities.."
-    for i in $(seq 1 $ca_count); do
+		for i in $(seq 1 ${ca_count}); do
 			echo -n "$i.."
-      _basepath=$(ca_i_basepath $i)
+			_basepath=$(ca_i_basepath ${i})
-      identity ca new --ca.overwrite \
+			${identity} ca new --ca.overwrite \
-                      --ca.cert-path $_basepath.cert \
+				--ca.cert-path ${_basepath}.cert \
-                      --ca.key-path $_basepath.key
+				--ca.key-path ${_basepath}.key
-      cat $_basepath.cert >> $ca_whitelist
+			cat ${_basepath}.cert >> ${ca_whitelist}
 		done
 		echo "done"
 		echo -n "generating alpha identities"
-    for dir in $basepath/{f*,sat*,up*}; do
+		for dir in ${basepath}/{f*,sat*,up*}; do
 			echo -n "."
 			_ca_basepath=$(rand_ca_basepath)
-      _ca_cert=$dir/ca-alpha.cert
+			_ca_cert=${dir}/ca-alpha.cert
-      _ca_key=$dir/ca-alpha.key
+			_ca_key=${dir}/ca-alpha.key
-      identity ca new --ca.overwrite \
+			${identity} ca new --ca.overwrite \
-                      --ca.cert-path $_ca_cert \
+				--ca.cert-path ${_ca_cert} \
-                      --ca.key-path $_ca_key \
+				--ca.key-path ${_ca_key} \
-                      --ca.parent-cert-path $_ca_basepath.cert \
+				--ca.parent-cert-path ${_ca_basepath}.cert \
-                      --ca.parent-key-path $_ca_basepath.key
+				--ca.parent-key-path ${_ca_basepath}.key
-      identity id new --identity.overwrite \
+			${identity} id new --identity.overwrite \
-                      --identity.cert-path $dir/identity-alpha.cert \
+				--identity.cert-path ${dir}/identity-alpha.cert \
-                      --identity.key-path $dir/identity-alpha.key \
+				--identity.key-path ${dir}/identity-alpha.key \
-                      --ca.cert-path $_ca_cert \
+				--ca.cert-path ${_ca_cert} \
-                      --ca.key-path $_ca_key
+				--ca.key-path ${_ca_key}
 		done
 		echo "done"
 		echo "writing alpha config"
-    cat $basepath/config.yaml | \
+		cat ${basepath}/config.yaml | \
 			sed "s,peer-ca-whitelist-path: \"\",peer-ca-whitelist-path: $ca_whitelist,g" | \
 			sed -E 's,cert-path: (.+)\.cert,cert-path: \1-alpha.cert,g' | \
 			sed -E 's,key-path: (.+)\.key,key-path: \1-alpha.key,g' \
-		> $alpha_config
+			> ${alpha_config}
 		echo "writing unauthorized config"
-    cat $basepath/config.yaml | sed -E "s,peer-ca-whitelist-path: \"\",peer-ca-whitelist-path: $ca_whitelist,g" > "$unauthorized_config"
+		cat ${basepath}/config.yaml | sed -E "s,peer-ca-whitelist-path: \"\",peer-ca-whitelist-path: $ca_whitelist,g" >"$unauthorized_config"
 	;;
 	alpha)
-    captplanet run --config $alpha_config
+		build captplanet
+		${captplanet} run --config ${alpha_config}
 	;;
 	unauthorized)
-    captplanet run --config $unauthorized_config
+		build captplanet
+		${captplanet} run --config ${unauthorized_config}
 	;;
 	run)
-    captplanet run
+		${captplanet} run
 	;;
 	*)
-    $0 --help
+		$@ --help
 	;;
 esac
+
+rm -rf ${tmp_dir}

scripts/utils.sh

@@ -0,0 +1,64 @@
+#!/usr/bin/env bash
+
+dots() {
+	echo -n "."
+	sleep 1
+	dots
+}
+
+dots_on() {
+	dots &
+	dots_pid=$!
+}
+
+dots_off() {
+	disown $dots_pid
+	kill "$dots_pid"
+}
+
+build() {
+	local tmp_dir=$1
+	shift
+	echo "building temp binaries:"
+	for cmd in $@; do
+		echo -n "	building $cmd..."
+		dots_on
+		local path=${tmp_dir}/${cmd}
+		declare -g ${cmd}=${path}
+		go build -o ${path} storj.io/storj/cmd/${cmd}
+		dots_off
+		echo "done"
+	done
+	echo "	binaries built in $tmp_dir"
+}
+
+temp_build() {
+	tmp_dir=$(mktemp -d)
+	build ${tmp_dir} $@
+}
+
+check_help() {
+	if [ $1 == "--help" ] || [ $1 == "-h" ]; then
+		echo $2
+		exit 0
+	fi
+}
+
+ensure_dir() {
+	if [ ! -d $1 ]; then
+		mkdir $1
+	fi
+}
+
+no_overwrite() {
+	if [ -e $1 ]; then
+	echo "Error: $1 already exists; refusing to overwrite"
+		exit 10
+	fi
+}
+
+log_list() {
+	for f in $@; do
+		echo ${f}
+	done
+}

scripts/waitlist/storj.sh

@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+source $(dirname $0)/../utils.sh
+
+comment() {
+	cat << EOF
+-----BEGIN COMMENT-----
+Label: $1
+Description: $2
+-----END COMMENT-----
+EOF
+}
+
+case $1 in
+	--help)
+		echo "usage: $0 new"
+	;;
+	new)
+		shift
+		check_help $1 	"usage: storj.sh new <label> <output dir> [<whitelist path>]"
+		temp_build identity
+		label=$1
+		out_dir=$2
+		whitelist=$3
+		cert_path=${out_dir}/${label}.cert
+		key_path=${out_dir}/${label}.key
+
+		ensure_dir ${out_dir}
+		no_overwrite ${cert_path}
+		no_overwrite ${key_path}
+		${identity} ca new \
+			--ca.cert-path ${cert_path} \
+			--ca.key-path ${key_path}
+
+		echo "wrote:"
+		log_list ${cert_path} ${key_path}
+
+		if [ $# -gt 2 ]; then
+			comment ${label} >> ${whitelist}
+			cat ${cert_path} >> ${whitelist}
+			echo "appended to whitelist at $whitelist"
+		fi
+	;;
+	*)
+		$0 --help
+	;;
+esac

scripts/waitlist/user.sh

@@ -0,0 +1,58 @@
+#!/usr/bin/env bash
+source $(dirname $0)/../utils.sh
+
+new_ca() {
+	${identity} ca new \
+		--ca.cert-path ${ca_cert_path} \
+		--ca.key-path ${ca_key_path} \
+		--ca.parent-cert-path ${parent_cert_path} \
+		--ca.parent-key-path ${parent_key_path}
+}
+
+case $1 in
+	--help)
+		echo "usage: user.sh new|batch"
+	;;
+	new)
+		shift
+		check_help $1 "usage: identity.sh new <parent dir> <parent label> <label> <output dir>"
+		temp_build identity
+		parent_cert_path=${1}/${2}.cert
+		parent_key_path=${1}/${2}.key
+		ca_cert_path=${4}/${3}.cert
+		ca_key_path=${4}/${3}.key
+
+		ensure_dir $4
+		no_overwrite ${ca_cert_path}
+		no_overwrite ${ca_key_path}
+		new_ca
+
+		echo "wrote:"
+		log_list ${ca_cert_path} ${ca_key_path}
+		echo "certificate signed by cert:"
+		log_list ${parent_cert_path} ${parent_key_path}
+	;;
+	batch)
+		shift
+		check_help $1 "usage: user.sh batch <labels file> <parent dir> <parent label> <output dir>"
+		temp_build identity
+		labels=$(cat $1)
+
+		for label in ${labels}; do
+			parent_cert_path=${2}/${3}.cert
+			parent_key_path=${2}/${3}.key
+			ca_cert_path=${4}/${label}.cert
+			ca_key_path=${4}/${label}.key
+
+			ensure_dir $4
+			no_overwrite ${ca_cert_path}
+			no_overwrite ${ca_key_path}
+			new_ca
+
+			log_list ${ca_cert_path} ${ca_key_path}
+		done
+
+		echo "certificates signed by cert:"
+		log_list ${parent_cert_path} ${parent_key_path}
+	;;
+esac