mirror of
https://gitlab.crans.org/nounous/ghostream.git
synced 2025-07-05 14:53:53 +02:00
Compare commits
1 Commits
7e0ee7aba5
...
ovenmediae
| Author | SHA1 | Date | |
|---|---|---|---|
| 91b7f3d789 |
@ -3,13 +3,10 @@ package ldap
|
||||
|
||||
import (
|
||||
"github.com/go-ldap/ldap/v3"
|
||||
"log"
|
||||
"strings"
|
||||
)
|
||||
|
||||
// Options holds package configuration
|
||||
type Options struct {
|
||||
Aliases map[string]map[string]string
|
||||
URI string
|
||||
UserDn string
|
||||
}
|
||||
@ -23,33 +20,11 @@ type LDAP struct {
|
||||
// Login tries to bind to LDAP
|
||||
// Returns (true, nil) if success
|
||||
func (a LDAP) Login(username string, password string) (bool, error) {
|
||||
aliasSplit := strings.SplitN(username, "__", 2)
|
||||
potentialUsernames := []string{username}
|
||||
|
||||
for len(aliasSplit) == 2 {
|
||||
alias := aliasSplit[0]
|
||||
trueUsername := aliasSplit[1]
|
||||
// Resolve stream alias if necessary
|
||||
if aliases, ok := a.Cfg.Aliases[alias]; ok {
|
||||
if _, ok := aliases[trueUsername]; ok {
|
||||
log.Printf("[LDAP] Use stream alias %s for username %s", alias, trueUsername)
|
||||
potentialUsernames = append(potentialUsernames, trueUsername)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var err error = nil
|
||||
for _, username := range potentialUsernames {
|
||||
// Try to bind as user
|
||||
bindDn := "cn=" + username + "," + a.Cfg.UserDn
|
||||
err = a.Conn.Bind(bindDn, password)
|
||||
if err == nil {
|
||||
// Login succeeded if no error
|
||||
return true, nil
|
||||
}
|
||||
}
|
||||
err := a.Conn.Bind(bindDn, password)
|
||||
|
||||
// Unable to log in
|
||||
// Login succeeded if no error
|
||||
return err == nil, err
|
||||
}
|
||||
|
||||
|
||||
@ -23,9 +23,6 @@
|
||||
<HLS>
|
||||
<Port>80</Port>
|
||||
</HLS>
|
||||
<DASH>
|
||||
<Port>80</Port>
|
||||
</DASH>
|
||||
</Publishers>
|
||||
</Bind>
|
||||
|
||||
@ -55,15 +52,14 @@
|
||||
</Video>
|
||||
</Encode>
|
||||
<Encode>
|
||||
<Name>bypass</Name>
|
||||
<Audio>
|
||||
<Bypass>true</Bypass>
|
||||
</Audio>
|
||||
<Name>BYPASS</Name>
|
||||
<Video>
|
||||
<Bypass>true</Bypass>
|
||||
</Video>
|
||||
<Audio>
|
||||
<Bypass>true</Bypass>
|
||||
</Audio>
|
||||
</Encode>
|
||||
|
||||
</Encodes>
|
||||
<Streams>
|
||||
<Stream>
|
||||
@ -75,10 +71,9 @@
|
||||
<Stream>
|
||||
<Name>${OriginStreamName}_bypass</Name>
|
||||
<Profiles>
|
||||
<Profile>bypass</Profile>
|
||||
<Profile>BYPASS</Profile>
|
||||
</Profiles>
|
||||
</Stream>
|
||||
|
||||
</Streams>
|
||||
<Providers>
|
||||
<RTMP>
|
||||
@ -91,25 +86,12 @@
|
||||
<Timeout>30000</Timeout>
|
||||
</WebRTC>
|
||||
<HLS>
|
||||
<SegmentDuration>2</SegmentDuration>
|
||||
<SegmentDuration>5</SegmentDuration>
|
||||
<SegmentCount>2</SegmentCount>
|
||||
<CrossDomain>
|
||||
<Url>*</Url>
|
||||
</CrossDomain>
|
||||
</HLS>
|
||||
<DASH>
|
||||
<SegmentDuration>2</SegmentDuration>
|
||||
<SegmentCount>2</SegmentCount>
|
||||
<CrossDomain>
|
||||
<Url>*</Url>
|
||||
</CrossDomain>
|
||||
</DASH>
|
||||
<LLDASH>
|
||||
<SegmentDuration>2</SegmentDuration>
|
||||
<CrossDomain>
|
||||
<Url>*</Url>
|
||||
</CrossDomain>
|
||||
</LLDASH>
|
||||
</Publishers>
|
||||
</Application>
|
||||
</Applications>
|
||||
|
||||
@ -34,13 +34,6 @@ auth:
|
||||
#ldap:
|
||||
# uri: ldap://127.0.0.1:389
|
||||
# userdn: cn=users,dc=example,dc=com
|
||||
#
|
||||
# # You can define aliases, to stream on stream.example.com/example with the credentials of the demo account.
|
||||
# # You will have to use the streamid example__demo:password
|
||||
# aliases:
|
||||
# example:
|
||||
# demo: ignored
|
||||
#
|
||||
|
||||
## Stream forwarding ##
|
||||
# Forward an incoming stream to other servers
|
||||
|
||||
@ -42,7 +42,6 @@ func New() *Config {
|
||||
Credentials: make(map[string]string),
|
||||
},
|
||||
LDAP: ldap.Options{
|
||||
Aliases: make(map[string]map[string]string),
|
||||
URI: "ldap://127.0.0.1:389",
|
||||
UserDn: "cn=users,dc=example,dc=com",
|
||||
},
|
||||
|
||||
@ -47,20 +47,10 @@ export function initViewerPage(stream, omeApp, viewersCounterRefreshPeriod, post
|
||||
"label": " WebRTC - Source"
|
||||
},
|
||||
{
|
||||
"file": "https://" + window.location.host + "/" + omeApp + "/" + stream + "_bypass/playlist.m3u8",
|
||||
"type": "hls",
|
||||
"file": "https://" + window.location.host + "/" + omeApp + "/" + stream + "_bypass/playlist.m3u8",
|
||||
"label": " HLS"
|
||||
},
|
||||
{
|
||||
"file": "https://" + window.location.host + "/" + omeApp + "/" + stream + "_bypass/manifest.mpd",
|
||||
"type": "dash",
|
||||
"label": "DASH"
|
||||
},
|
||||
{
|
||||
"file": "https://" + window.location.host + "/" + omeApp + "/" + stream + "_bypass/manifest_ll.mpd",
|
||||
"type": "dash",
|
||||
"label": "LL-DASH"
|
||||
},
|
||||
}
|
||||
]
|
||||
});
|
||||
player.on("stateChanged", function (data) {
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1 +0,0 @@
|
||||
/*! OvenPlayerv0.9.0 | (c)2020 AirenSoft Co., Ltd. | MIT license (https://github.com/AirenSoft/OvenPlayerPrivate/blob/master/LICENSE) | Github : https://github.com/AirenSoft/OvenPlayer */
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1 +0,0 @@
|
||||
/*! OvenPlayerv0.9.0 | (c)2020 AirenSoft Co., Ltd. | MIT license (https://github.com/AirenSoft/OvenPlayerPrivate/blob/master/LICENSE) | Github : https://github.com/AirenSoft/OvenPlayer */
|
||||
@ -36,7 +36,6 @@
|
||||
|
||||
{{if .OMECfg.Enabled}}
|
||||
<script src="https://cdn.jsdelivr.net/npm/hls.js@latest"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/dashjs/2.9.3/dash.all.min.js"></script>
|
||||
<script src="/static/ovenplayer/ovenplayer.js"></script>
|
||||
<script src="/static/js/ovenplayer.js"></script>
|
||||
{{end}}
|
||||
|
||||
Reference in New Issue
Block a user