Changeset 385 in code

Timestamp:

Aug 11, 2020, 8:59:06 AM (5 years ago)

Author:

contact

Message:

Add an ident server

Closes: ​https://todo.sr.ht/~emersion/soju/69

Location:

trunk

Files:

• cmd/soju/main.go (modified) (1 diff)
• server.go (modified) (1 diff)
• user.go (modified) (4 diffs)

trunk/cmd/soju/main.go

@@ -125 +125 @@
                                 log.Fatal(httpSrv.ListenAndServe())
                         }()
+                case "ident":
+                        if srv.Identd == nil {
+                                srv.Identd = soju.NewIdentd()
+                        }
+
+                        host := u.Host
+                        if _, _, err := net.SplitHostPort(host); err != nil {
+                                host = host + ":113"
+                        }
+                        ln, err := net.Listen("tcp", host)
+                        if err != nil {
+                                log.Fatalf("failed to start listener on %q: %v", listen, err)
+                        }
+                        go func() {
+                                log.Fatal(srv.Identd.Serve(ln))
+                        }()
                 default:
                         log.Fatalf("failed to listen on %q: unsupported scheme", listen)

trunk/server.go

@@ -52 +52 @@
         HTTPOrigins    []string
         AcceptProxyIPs config.IPSet
+        Identd         *Identd // can be nil
 
         db *DB

trunk/user.go

@@ -2 +2 @@
 
 import (
+        "crypto/sha256"
+        "encoding/base64"
+        "encoding/binary"
         "fmt"
         "time"
@@ -100 +103 @@
 }
 
+func userIdent(u *User) string {
+        // The ident is a string we will send to upstream servers in clear-text.
+        // For privacy reasons, make sure it doesn't expose any meaningful user
+        // metadata. We just use the base64-encoded hashed ID, so that people don't
+        // start relying on the string being an integer or following a pattern.
+        var b [64]byte
+        binary.LittleEndian.PutUint64(b[:], uint64(u.ID))
+        h := sha256.Sum256(b[:])
+        return base64.RawStdEncoding.EncodeToString(h[:])
+}
+
 func (net *network) run() {
         var lastTry time.Time
@@ -119 +133 @@
                         net.user.events <- eventUpstreamConnectionError{net, fmt.Errorf("failed to connect: %v", err)}
                         continue
+                }
+
+                if net.user.srv.Identd != nil {
+                        net.user.srv.Identd.Store(uc.RemoteAddr().String(), uc.LocalAddr().String(), userIdent(&net.user.User))
                 }
 
@@ -139 +157 @@
                 uc.Close()
                 net.user.events <- eventUpstreamDisconnected{uc}
+
+                if net.user.srv.Identd != nil {
+                        net.user.srv.Identd.Delete(uc.RemoteAddr().String(), uc.LocalAddr().String())
+                }
         }
 }