Mirrors
/
prologic-saltyim
mirror of https://git.mills.io/saltyim/saltyim.git
6
1
Fork 0
Code Issues Projects Releases Wiki Activity

fix_case_insensitive_addrs (#148) 

Fixes #144

Co-authored-by: James Mills <prologic@shortcircuit.net.au>
Reviewed-on: https://git.mills.io/saltyim/saltyim/pulls/148
Reviewed-by: xuu <xuu@noreply@mills.io>
Co-authored-by: James Mills <james@mills.io>
Co-committed-by: James Mills <james@mills.io>
This commit is contained in:
James Mills 2022-04-04 16:09:27 +00:00 committed by xuu
parent 832fb124fe
commit d90292bc8e
9 changed files with 25 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/salty-chat/avatar.go
View File

@ -3,7 +3,6 @@ package main
import (
"fmt"
"os"
"strings"
"github.com/spf13/cobra"
"github.com/spf13/viper"
@ -30,10 +29,9 @@ NOTE: This is only spported on a Salty Broker.`,
}
}
me := &saltyim.Addr{}
if sp := strings.Split(user, "@"); len(sp) > 1 {
me.User = sp[0]
me.Domain = sp[1]
me, err := saltyim.ParseAddr(user)
if err != nil {
fmt.Fprintf(os.Stderr, "error parsing addr: %s\n", err)
}
// XXX: What if me.IsZero()

8
cmd/salty-chat/chat.go
View File

@ -3,7 +3,6 @@ package main
import (
"fmt"
"os"
"strings"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
@ -34,10 +33,9 @@ messages to the user via their discovered endpoint.`,
}
}
me := &saltyim.Addr{}
if sp := strings.Split(user, "@"); len(sp) > 1 {
me.User = sp[0]
me.Domain = sp[1]
me, err := saltyim.ParseAddr(user)
if err != nil {
fmt.Fprintf(os.Stderr, "error parsing addr: %s\n", err)
}
// XXX: What if me.IsZero()

7
cmd/salty-chat/makeuser.go
View File

@ -68,10 +68,9 @@ NOTE: The <endpoint> argument will override and -u/--endpoint flag set.`,
endpoint = args[1]
}
me := &saltyim.Addr{}
if sp := strings.Split(args[0], "@"); len(sp) > 1 {
me.User = sp[0]
me.Domain = sp[1]
me, err := saltyim.ParseAddr(args[0])
if err != nil {
fmt.Fprintf(os.Stderr, "error parsing addr: %s\n", err)
}
// XXX: What if me.IsZero()

8
cmd/salty-chat/read.go
View File

@ -4,7 +4,6 @@ import (
"fmt"
"os"
"os/signal"
"strings"
"syscall"
"github.com/mattn/go-isatty"
@ -34,10 +33,9 @@ not specified defaults to the local user ($USER)`,
}
}
me := &saltyim.Addr{}
if sp := strings.Split(user, "@"); len(sp) > 1 {
me.User = sp[0]
me.Domain = sp[1]
me, err := saltyim.ParseAddr(user)
if err != nil {
fmt.Fprintf(os.Stderr, "error parsing addr: %s\n", err)
}
// XXX: What if me.IsZero()

8
cmd/salty-chat/register.go
View File

@ -4,7 +4,6 @@ import (
"fmt"
"os"
"path/filepath"
"strings"
"github.com/spf13/cobra"
"github.com/spf13/viper"
@ -26,10 +25,9 @@ NOTE: This is only spported o a Salty Broker.`,
identity := viper.GetString("identity")
broker := viper.GetString("broker")
me := &saltyim.Addr{}
if sp := strings.Split(args[0], "@"); len(sp) > 1 {
me.User = sp[0]
me.Domain = sp[1]
me, err := saltyim.ParseAddr(args[0])
if err != nil {
fmt.Fprintf(os.Stderr, "error parsing addr: %s\n", err)
}
// XXX: What if me.IsZero()

7
cmd/salty-chat/send.go
View File

@ -46,10 +46,9 @@ https://mills.io/.well-known/salty/prologic.json`,
}
}
me := &saltyim.Addr{}
if sp := strings.Split(user, "@"); len(sp) > 1 {
me.User = sp[0]
me.Domain = sp[1]
me, err := saltyim.ParseAddr(user)
if err != nil {
fmt.Fprintf(os.Stderr, "error parsing addr: %s\n", err)
}
// XXX: What if me.IsZero()

11
identity.go
View File

@ -17,18 +17,15 @@ import (
func readUser(fd io.Reader) (*Addr, error) {
scan := bufio.NewScanner(fd)
addr := &Addr{}
for scan.Scan() {
if strings.HasPrefix(scan.Text(), "# user:") {
user := strings.Split(strings.TrimSpace(strings.TrimPrefix(scan.Text(), "# user:")), "@")
if len(user) != 2 {
return nil, nil
addr, err := ParseAddr(strings.TrimSpace(strings.TrimPrefix(scan.Text(), "# user:")))
if err == nil {
return addr, nil
}
addr.User, addr.Domain = user[0], user[1]
}
}
return addr, scan.Err()
return nil, scan.Err()
}
// DefaultIdentity returns a default identity file (if one exists) otherwise

4
internal/web/app.wasm
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6fd89a4b35a4cb8b0cb1c8e7db9a5dfc68bc53b56cb4ff39d70b96afa75af30a
size 290
oid sha256:093b8f14002fea44c277ccf5b4aa51ec9d2ed2d0454a4c7c887c042eaecb3173
size 29218116

2
lookup.go
View File

@ -229,7 +229,7 @@ func (a *Addr) Avatar() string {
// parts and returns an Addr object with the User and Domain and a method
// for returning the expected User's Well-Known URI
func ParseAddr(addr string) (*Addr, error) {
parts := strings.Split(addr, "@")
parts := strings.Split(strings.ToLower(addr), "@")
if len(parts) != 2 {
return nil, fmt.Errorf("expected nick@domain found %q", addr)
}