Add find i2p function

Makefile

@@ -2,20 +2,20 @@
 
 GO111MODULE=on
 
-VERSION=0.0.01
+VERSION=0.0.06
 USER_GH=eyedeekay
 
 version:
 	gothub release -s $(GITHUB_TOKEN) -u $(USER_GH) -r checki2cp -t v$(VERSION) -d "I2P Router Checking CLI utility"
 
-fmt:
-	gofmt -w *.go canal/main.go
+delete:
+	gothub delete -s $(GITHUB_TOKEN) -u $(USER_GH) -r checki2cp -t v$(VERSION)
 
 GO_COMPILER_OPTS = -a -tags netgo -ldflags '-w -extldflags "-static"'
 
 build: fmt test clean
-	cd ./i2cpcheck && go build $(GO_COMPILER_OPTS) && \
-		GOOS=windows GOARCH=amd64 go build $(GO_COMPILER_OPTS) -buildmode=exe -o i2cpcheck.exe
+	cd ./i2cpcheck && go build $(GO_COMPILER_OPTS)
+	cd ./i2cpcheck && GOOS=windows GOARCH=amd64 go build $(GO_COMPILER_OPTS) -buildmode=exe -o i2cpcheck.exe
 
 test:
 	go test -v

checki2cp.go

@@ -3,8 +3,11 @@ package checki2p
 import (
 	"fmt"
 	"github.com/eyedeekay/go-i2cp"
+	"io/ioutil"
 	"log"
 	"os"
+	"os/user"
+	"runtime"
 	"strings"
 )
 
@@ -25,15 +28,23 @@ func checkfileexists(path string) bool {
 	return false
 }
 
+func home() string {
+	if runtime.GOOS == "windows" {
+		return "\\i2p"
+	}
+	return "/.i2p"
+}
+
 var (
-	I2CP_HOST                     string = ""
-	I2CP_PORT                     string = ""
-	WINDOWS_DEFAULT_LOCATION      string = `C:\\Program Files\i2p\i2psvc.exe`
-	I2PD_WINDOWS_DEFAULT_LOCATION string = `C:\\Program Files\I2Pd\i2pd.exe`
-	LINUX_SYSTEM_LOCATION         string = "/usr/bin/i2prouter"
-	I2PD_LINUX_SYSTEM_LOCATION    string = "/usr/sbin/i2pd"
-	HOME_DIRECTORY_LOCATION       string = inithome("/i2p/i2prouter")
-	OSX_DEFAULT_LOCATION          string = inithome("/Library/Application Support/i2p/clients.config")
+	I2CP_HOST                     string   = ""
+	I2CP_PORT                     string   = ""
+	WINDOWS_DEFAULT_LOCATION      string   = `C:\\Program Files\i2p\i2psvc.exe`
+	I2PD_WINDOWS_DEFAULT_LOCATION string   = `C:\\Program Files\I2Pd\i2pd.exe`
+	LINUX_SYSTEM_LOCATION         []string = []string{"/usr/bin/i2prouter", "/usr/sbin/i2prouter"}
+	I2PD_LINUX_SYSTEM_LOCATION    string   = "/usr/sbin/i2pd"
+	I2P_ASUSER_HOME_LOCATION      string   = inithome(home())
+	HOME_DIRECTORY_LOCATION       string   = inithome("/i2p/i2prouter")
+	OSX_DEFAULT_LOCATION          string   = inithome("/Library/Application Support/i2p/clients.config")
 )
 
 // CheckIC2PIsRunning is frequently the only thing I need a reliable, non-SAM
@@ -70,7 +81,11 @@ func CheckI2PIsInstalledDefaultLocation() (bool, error) {
 		log.Println("Windows i2p router detected")
 		return true, nil
 	}
-	if checkfileexists(LINUX_SYSTEM_LOCATION) {
+	if checkfileexists(LINUX_SYSTEM_LOCATION[0]) {
+		log.Println("Linux i2p router detected")
+		return true, nil
+	}
+	if checkfileexists(LINUX_SYSTEM_LOCATION[1]) {
 		log.Println("Linux i2p router detected")
 		return true, nil
 	}
@@ -90,9 +105,8 @@ func UserFind() string {
 		str := os.Getenv("SUDO_USER")
 		return str
 	}
-	if str, err := os.UserHomeDir(); err == nil {
-		x := strings.Split(str, "/")
-		return strings.Replace(x[len(x)-1], "/", "", -1)
+	if un, err := user.Current(); err == nil {
+		return un.Name
 	}
 	return ""
 }
@@ -103,7 +117,7 @@ func UserFind() string {
 func CheckI2PUserName() (string, error) {
 	if checkfileexists(I2PD_WINDOWS_DEFAULT_LOCATION) {
 		log.Println("Windows i2pd router detected")
-		return "i2pd.exe", nil
+		return "i2pd", nil
 	}
 	if checkfileexists(I2PD_LINUX_SYSTEM_LOCATION) {
 		log.Println("Linux i2pd router detected")
@@ -111,9 +125,13 @@ func CheckI2PUserName() (string, error) {
 	}
 	if checkfileexists(WINDOWS_DEFAULT_LOCATION) {
 		log.Println("Windows i2p router detected")
-		return "i2psvc.exe", nil
+		return "i2psvc", nil
 	}
-	if checkfileexists(LINUX_SYSTEM_LOCATION) {
+	if checkfileexists(LINUX_SYSTEM_LOCATION[0]) {
+		log.Println("Linux i2p router detected")
+		return "i2psvc", nil
+	}
+	if checkfileexists(LINUX_SYSTEM_LOCATION[1]) {
 		log.Println("Linux i2p router detected")
 		return "i2psvc", nil
 	}
@@ -127,3 +145,56 @@ func CheckI2PUserName() (string, error) {
 	}
 	return "", nil
 }
+
+// GetFirewallPort finds the configured UDP port of your I2P router to help
+// configure firewalls. It does this by finding the router.config and reading
+// it.
+func GetFirewallPort() (string, error) {
+	log.Println(I2P_ASUSER_HOME_LOCATION)
+	file, err := ioutil.ReadFile(I2P_ASUSER_HOME_LOCATION + "/router.config")
+	if err != nil {
+		return "", err
+	}
+	lines := strings.Split(string(file), "\n")
+	for index, line := range lines {
+		if strings.HasPrefix(line, "i2np.udp.port") {
+			log.Println(line, index)
+			return strings.Replace(line, "i2np.udp.port=", "", -1), nil
+		}
+	}
+	return "", fmt.Errorf("Improperly formed router.config file")
+}
+
+// FindI2PIsInstalledDefaultLocation looks in various locations for the
+// presence of an I2P router, reporting back the location
+func FindI2PIsInstalledDefaultLocation() (string, error) {
+	if checkfileexists(I2PD_WINDOWS_DEFAULT_LOCATION) {
+		log.Println("Windows i2pd router detected")
+		return I2PD_WINDOWS_DEFAULT_LOCATION, nil
+	}
+	if checkfileexists(I2PD_LINUX_SYSTEM_LOCATION) {
+		log.Println("Linux i2pd router detected")
+		return I2PD_LINUX_SYSTEM_LOCATION, nil
+	}
+	if checkfileexists(WINDOWS_DEFAULT_LOCATION) {
+		log.Println("Windows i2p router detected")
+		return WINDOWS_DEFAULT_LOCATION, nil
+	}
+	if checkfileexists(LINUX_SYSTEM_LOCATION[0]) {
+		log.Println("Linux i2p router detected")
+		return LINUX_SYSTEM_LOCATION[0], nil
+	}
+	if checkfileexists(LINUX_SYSTEM_LOCATION[1]) {
+		log.Println("Linux i2p router detected")
+		return LINUX_SYSTEM_LOCATION[1], nil
+	}
+	if checkfileexists(HOME_DIRECTORY_LOCATION) {
+		log.Println("Linux i2p router detected")
+		return HOME_DIRECTORY_LOCATION, nil
+	}
+	if checkfileexists(OSX_DEFAULT_LOCATION) {
+		log.Println("OSX i2p router detected")
+		return OSX_DEFAULT_LOCATION, nil
+	}
+	return "", fmt.Errorf("i2p router not found.")
+}

checki2cp_test.go

@@ -27,3 +27,11 @@ func TestRouter(t *testing.T) {
 		t.Log("I2P is in a default location, user feedback is needed")
 	}
 }
+
+func TestFirewallPort(t *testing.T) {
+	port, err := GetFirewallPort()
+	if err != nil {
+		t.Fatal(err)
+	}
+	t.Log("Port was", port)
+}

go.mod

@@ -0,0 +1,5 @@
+module github.com/eyedeekay/checki2cp
+
+go 1.13
+
+require github.com/eyedeekay/go-i2cp v0.0.0-20190716135428-6d41bed718b0

i2cpcheck/main.go

@@ -13,10 +13,15 @@ func main() {
 	}
 	if ok {
 		log.Println("I2P is running, successfully confirmed I2CP")
-		os.Exit(0)
 	} else {
 		log.Println("I2P is not running, further testing is needed")
 	}
+	firewallport, err := checki2p.GetFirewallPort()
+	if err != nil {
+		log.Fatal(err)
+	}
+	log.Println("I2P's firewall port is:", firewallport)
+
 	ok, err = checki2p.CheckI2PIsInstalledDefaultLocation()
 	if err != nil {
 		log.Fatal(err)
@@ -28,4 +33,5 @@ func main() {
 		log.Println("I2P is not a default location, user feedback is needed")
 		os.Exit(1)
 	}
+
 }