apps/go2rtc
1
0
Fork 0
mirror of https://github.com/AlexxIT/go2rtc.git synced 2025-10-05 08:16:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update TLS files handling

Browse Source
This commit is contained in:
Alex X
2023-10-14 15:51:43 +03:00
parent 05accb4555
commit 36ee2b29fb
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
internal/api/api.go
View File

@@ -85,7 +85,14 @@ func Init() {
// Initialize the HTTPS server // Initialize the HTTPS server
if cfg.Mod.TLSListen != "" && cfg.Mod.TLSCert != "" && cfg.Mod.TLSKey != "" { if cfg.Mod.TLSListen != "" && cfg.Mod.TLSCert != "" && cfg.Mod.TLSKey != "" {
cert, err := tls.X509KeyPair(readPEM(cfg.Mod.TLSCert), readPEM(cfg.Mod.TLSKey)) var cert tls.Certificate
if strings.IndexByte(cfg.Mod.TLSCert, '\n') < 0 && strings.IndexByte(cfg.Mod.TLSKey, '\n') < 0 {
// check if file path
cert, err = tls.LoadX509KeyPair(cfg.Mod.TLSCert, cfg.Mod.TLSKey)
} else {
// if text file content
cert, err = tls.X509KeyPair([]byte(cfg.Mod.TLSCert), []byte(cfg.Mod.TLSKey))
}
if err != nil { if err != nil {
log.Error().Err(err).Caller().Send() log.Error().Err(err).Caller().Send()
return return
@@ -260,12 +267,3 @@ func Error(w http.ResponseWriter, err error) {
http.Error(w, err.Error(), http.StatusInsufficientStorage) http.Error(w, err.Error(), http.StatusInsufficientStorage)
} }
func readPEM(s string) []byte {
if strings.IndexByte(s, '\n') > 0 {
return []byte(s)
}
b, _ := os.ReadFile(s)
return b
}