diff --git a/internal/handler/views/add_node_templ.go b/internal/handler/views/add_node_templ.go
index 36ea5fc..9c8b2b0 100644
--- a/internal/handler/views/add_node_templ.go
+++ b/internal/handler/views/add_node_templ.go
@@ -37,7 +37,7 @@ func AddNode() templ.Component {
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
- _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
Add Monero Node
You can use this page to add known remote node to the system so my bots can monitor it.
Important Note
- As an administrator of this instance, I have full rights to delete, and blacklist any submitted node with or without providing any reason.
Enter your Monero node information below (IPv6 host check is experimental):
")
+ _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
Add Monero Node
You can use this page to add known remote node to the system so my bots can monitor it.
Important Note
- As an administrator of this instance, I have full rights to delete, and blacklist any submitted node with or without providing any reason.
- I2P nodes monitoring is beta and currently only support b32 address.
Enter your Monero node information below:
")
if templ_7745c5c3_Err != nil {
return templ_7745c5c3_Err
}
diff --git a/internal/monero/monero.go b/internal/monero/monero.go
index 7574763..200a2d8 100644
--- a/internal/monero/monero.go
+++ b/internal/monero/monero.go
@@ -35,6 +35,7 @@ type Node struct {
Port uint `json:"port" db:"port"`
Protocol string `json:"protocol" db:"protocol"`
IsTor bool `json:"is_tor" db:"is_tor"`
+ IsI2P bool `json:"is_i2p" db:"is_i2p"`
IsAvailable bool `json:"is_available" db:"is_available"`
Nettype string `json:"nettype" db:"nettype"`
Height uint `json:"height" db:"height"`
@@ -196,14 +197,25 @@ func (r *moneroRepo) Add(protocol string, hostname string, port uint) error {
is_tor := false
if strings.HasSuffix(hostname, ".onion") {
+ if !validTorHostname(hostname) {
+ return errors.New("Invalid TOR v3 .onion hostname")
+ }
is_tor = true
}
+ is_i2p := false
+ if strings.HasSuffix(hostname, ".i2p") {
+ if !validI2PHostname(hostname) {
+ return errors.New("Invalid I2P hostname")
+ }
+ is_i2p = true
+ }
+
ipAddr := ""
ips := ""
ipv6_only := false
- if !is_tor {
+ if !is_tor && !is_i2p {
hostIps, err := net.LookupIP(hostname)
if err != nil {
return err
@@ -221,10 +233,6 @@ func (r *moneroRepo) Add(protocol string, hostname string, port uint) error {
ipAddr = hostIp.String()
ips = ip.SliceToString(hostIps)
- } else {
- if !validTorHostname(hostname) {
- return errors.New("Invalid TOR v3 .onion hostname")
- }
}
row, err := r.db.Query(`
@@ -252,6 +260,7 @@ func (r *moneroRepo) Add(protocol string, hostname string, port uint) error {
hostname,
port,
is_tor,
+ is_i2p,
nettype,
ip_addr,
lat,
@@ -274,12 +283,14 @@ func (r *moneroRepo) Add(protocol string, hostname string, port uint) error {
?,
?,
?,
+ ?,
?
)`,
protocol,
hostname,
port,
is_tor,
+ is_i2p,
"",
ipAddr,
0,
@@ -304,6 +315,14 @@ func validTorHostname(hostname string) bool {
return regexp.MustCompile(`^([a-z0-9-]+\.)*[a-z2-7]{56}\.onion$`).MatchString(hostname)
}
+// validI2PHostname checks if a given hostname is a valid p32 I2P address
+//
+// Old b32 addresses are always {52 chars}.b32.i2p and new ones are {56+ chars}.b32.i2p.
+// See: https://geti2p.net/spec/b32encrypted
+func validI2PHostname(hostname string) bool {
+ return regexp.MustCompile(`^[a-z2-7]{52,}\.b32\.i2p$`).MatchString(hostname)
+}
+
func (r *moneroRepo) Delete(id uint) error {
if _, err := r.db.Exec(`DELETE FROM tbl_node WHERE id = ?`, id); err != nil {
return err
diff --git a/internal/monero/report.go b/internal/monero/report.go
index 674950c..0906069 100644
--- a/internal/monero/report.go
+++ b/internal/monero/report.go
@@ -109,7 +109,7 @@ func (r *moneroRepo) Logs(q QueryLogs) (FetchLogs, error) {
}
// GiveJob returns node that should be probed for the next time
-func (r *moneroRepo) GiveJob(acceptTor, acceptIPv6 int) (Node, error) {
+func (r *moneroRepo) GiveJob(acceptTor, acceptI2P, acceptIPv6 int) (Node, error) {
args := []interface{}{}
wq := []string{}
where := ""
@@ -118,6 +118,10 @@ func (r *moneroRepo) GiveJob(acceptTor, acceptIPv6 int) (Node, error) {
wq = append(wq, "is_tor = ?")
args = append(args, 0)
}
+ if acceptI2P != 1 {
+ wq = append(wq, "is_i2p = ?")
+ args = append(args, 0)
+ }
if acceptIPv6 != 1 {
wq = append(wq, "ipv6_only = ?")
args = append(args, 0)
@@ -136,10 +140,11 @@ func (r *moneroRepo) GiveJob(acceptTor, acceptIPv6 int) (Node, error) {
port,
protocol,
is_tor,
+ is_i2p,
last_check_status
FROM
tbl_node
- %s -- where query if any
+ %s
ORDER BY
last_checked ASC
LIMIT 1`, where)
@@ -149,6 +154,7 @@ func (r *moneroRepo) GiveJob(acceptTor, acceptIPv6 int) (Node, error) {
&node.Port,
&node.Protocol,
&node.IsTor,
+ &node.IsI2P,
&node.LastCheckStatus)
if err != nil {
return node, err