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

Map domain to streamid instead of considering that the domain is the streamid: no need to pass a YAML key that contains dots

Browse Source
This commit is contained in:
Yohann D'ANELLO
2020-10-13 17:12:19 +02:00
parent 3b8c149e38
commit 4546f3b8fb
5 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
web/handler.go
View File

@ -24,17 +24,17 @@ func viewerPostHandler(w http.ResponseWriter, r *http.Request) {
// Get stream ID from URL, or from domain name
path := r.URL.Path[1:]
if cfg.OneStreamPerDomain {
host := r.Host
if strings.Contains(host, ":") {
realHost, _, err := net.SplitHostPort(r.Host)
if err != nil {
log.Printf("Failed to split host and port from %s", r.Host)
return
}
host = realHost
host := r.Host
if strings.Contains(host, ":") {
realHost, _, err := net.SplitHostPort(r.Host)
if err != nil {
log.Printf("Failed to split host and port from %s", r.Host)
return
}
path = host
host = realHost
}
if streamID, ok := cfg.MapDomainToStream[host]; ok {
path = streamID
}
// Decode client description
@ -73,20 +73,20 @@ func viewerPostHandler(w http.ResponseWriter, r *http.Request) {
func viewerGetHandler(w http.ResponseWriter, r *http.Request) {
// Get stream ID from URL, or from domain name
path := r.URL.Path[1:]
if cfg.OneStreamPerDomain {
host := r.Host
if strings.Contains(host, ":") {
realHost, _, err := net.SplitHostPort(r.Host)
if err != nil {
log.Printf("Failed to split host and port from %s", r.Host)
return
}
host = realHost
host := r.Host
if strings.Contains(host, ":") {
realHost, _, err := net.SplitHostPort(r.Host)
if err != nil {
log.Printf("Failed to split host and port from %s", r.Host)
return
}
host = realHost
}
if streamID, ok := cfg.MapDomainToStream[host]; ok {
if path == "about" {
path = ""
} else {
path = host
path = streamID
}
}