ynerant/ghostream
1
0
Fork 0
mirror of https://gitlab.crans.org/nounous/ghostream.git synced 2025-02-18 23:31:17 +00:00
Code Issues Releases Wiki Activity

Compare commits

base: ynerant:1520e78badeb630ec2d037e8c95c75a2f35c49b4
Branches Tags
ynerant:dev
ynerant:ovenmediaengine
ynerant:h264-reader
ynerant:multi-quality
ynerant:webrtc-messaging
ynerant:poc
...
compare: ynerant:34652f8f3e37863d923fc59d4a7d905c2f5f5284
Branches Tags
ynerant:dev
ynerant:ovenmediaengine
ynerant:h264-reader
ynerant:multi-quality
ynerant:webrtc-messaging
ynerant:poc

3 Commits
1520e78bad ... 34652f8f3e

Author SHA1 Message Date
Yohann D'ANELLO
34652f8f3e
I am an idiot, don't let only people with the *wrong* password stream 2021-01-08 23:05:01 +01:00
Yohann D'ANELLO
79f52ed880
Log the LDAP connection 2021-01-08 22:56:19 +01:00
Yohann D'ANELLO
ee16bf9e21
Alias is not properly replaced 2021-01-08 22:46:14 +01:00
2 changed files with 5 additions and 1 deletions
Show Stats Expand all files Collapse all files

2
auth/ldap/ldap.go
View File

@ -42,6 +42,7 @@ func (a LDAP) Login(username string, password string) (bool, string, error) {
for _, username := range potentialUsernames { for _, username := range potentialUsernames {
// Try to bind as user // Try to bind as user
bindDn := "cn=" + username + "," + a.Cfg.UserDn bindDn := "cn=" + username + "," + a.Cfg.UserDn
log.Printf("[LDAP] Logging to %s...", bindDn)
err = a.Conn.Bind(bindDn, password) err = a.Conn.Bind(bindDn, password)
if err == nil { if err == nil {
// Login succeeded if no error // Login succeeded if no error
@ -49,6 +50,7 @@ func (a LDAP) Login(username string, password string) (bool, string, error) {
} }
} }
log.Printf("[LDAP] Logging failed: %s", err)
// Unable to log in // Unable to log in
return err == nil, "", err return err == nil, "", err
} }

4
stream/srt/srt.go
View File

@ -82,11 +82,13 @@ func Serve(streams *messaging.Streams, authBackend auth.Backend, cfg *Options) {
name, password := split[0], split[1] name, password := split[0], split[1]
if authBackend != nil { if authBackend != nil {
// check password // check password
if ok, name, err := authBackend.Login(name, password); !ok || err != nil { ok, username, err := authBackend.Login(name, password)
if !ok || err != nil {
log.Printf("Failed to authenticate for stream %s", name) log.Printf("Failed to authenticate for stream %s", name)
s.Close() s.Close()
continue continue
} }
name = username
} }
go handleStreamer(s, streams, name) go handleStreamer(s, streams, name)