From: Amolith <amolith@secluded.site>
To: ~whereswaldon/arbor-dev@lists.sr.ht
Cc: Amolith <amolith@secluded.site>
Subject: [PATCH 11/12] Small changes to User target & normalising logs
Date: Wed, 20 Jul 2022 23:10:00 -0400
Message-Id: <20220721031001.97027-12-amolith@secluded.site>
In-Reply-To: <20220721031001.97027-1-amolith@secluded.site>
References: <20220721031001.97027-1-amolith@secluded.site>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

For the useradd command, shell is not usually set by default or it
defaults to /bin/sh.

Signed-off-by: Amolith <amolith@secluded.site>
---
 setup.go | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/setup.go b/setup.go
index f67f6c1..b12e45c 100644
--- a/setup.go
+++ b/setup.go
@@ -34,13 +34,19 @@ func Deploy() error {
 	return nil
 }
 
-
+// Create default system user "user" with SSH credentials from root user and
+// arbor-relay user with minimal permissions
 func Users() error {
-	fmt.Println("Running target users")
+	log.Println("Running target users")
 
 	// Cleanup the old user if it exists. This just deletes the *user*, all data will still be intact.
 	sh.Run("userdel", "user")
-	err := sh.Run("useradd", "-g", "sudo", "-m", "-d", "/home/user", "user")
+	err := sh.Run("useradd", "-g", "sudo", "-m", "-d", "/home/user", "-s", "/bin/bash", "user")
+	if err != nil {
+		return err
+	}
+
+	err = sh.Run("useradd", "-m", "-d", "/home/user", "-s", "/bin/bash", "arbor-relay")
 	if err != nil {
 		return err
 	}
@@ -140,8 +146,7 @@ func Apt() error {
 }
 
 func Firewall() error {
-	fmt.Println("running target firewall")
-
+	log.Println("Running target firewall")
 
 	err := sh.Run("ufw", "default", "deny", "outgoing")
 	if err != nil {
-- 
2.37.1