CEF/mediamtx
1
0
Fork 0
forked from External/mediamtx
Code Pull requests Activity

do not switch to legacy authentication system when readUser, readPass, publishUser, publishPass are present but are empty (#3113)

Browse source
This commit is contained in:
Alessandro Ros 2024-03-06 18:04:08 +01:00 • committed by GitHub
parent 2c857fc329
commit dd3b268346
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 26 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

28
internal/conf/conf.go
View file

@ -94,14 +94,24 @@ func mustParseCIDR(v string) net.IPNet {
return *ne return *ne
} }
func credentialIsNotEmpty(c *Credential) bool {
return c != nil && *c != ""
}
func ipNetworkIsNotEmpty(i *IPNetworks) bool {
return i != nil && len(*i) != 0
}
func anyPathHasDeprecatedCredentials(paths map[string]*OptionalPath) bool { func anyPathHasDeprecatedCredentials(paths map[string]*OptionalPath) bool {
for _, pa := range paths { for _, pa := range paths {
if pa != nil { if pa != nil {
rva := reflect.ValueOf(pa.Values).Elem() rva := reflect.ValueOf(pa.Values).Elem()
if !rva.FieldByName("PublishUser").IsNil() || !rva.FieldByName("PublishPass").IsNil() || if credentialIsNotEmpty(rva.FieldByName("PublishUser").Interface().(*Credential)) ||
!rva.FieldByName("PublishIPs").IsNil() || credentialIsNotEmpty(rva.FieldByName("PublishPass").Interface().(*Credential)) ||
!rva.FieldByName("ReadUser").IsNil() || !rva.FieldByName("ReadPass").IsNil() || ipNetworkIsNotEmpty(rva.FieldByName("PublishIPs").Interface().(*IPNetworks)) ||
!rva.FieldByName("ReadIPs").IsNil() { credentialIsNotEmpty(rva.FieldByName("ReadUser").Interface().(*Credential)) ||
credentialIsNotEmpty(rva.FieldByName("ReadPass").Interface().(*Credential)) ||
ipNetworkIsNotEmpty(rva.FieldByName("ReadIPs").Interface().(*IPNetworks)) {
return true return true
} }
} }
@ -460,10 +470,12 @@ func (conf *Conf) Validate() error {
return fmt.Errorf("'authJWTJWKS' must be a HTTP URL") return fmt.Errorf("'authJWTJWKS' must be a HTTP URL")
} }
deprecatedCredentialsMode := false deprecatedCredentialsMode := false
if conf.PathDefaults.PublishUser != nil || conf.PathDefaults.PublishPass != nil || if credentialIsNotEmpty(conf.PathDefaults.PublishUser) ||
conf.PathDefaults.PublishIPs != nil || credentialIsNotEmpty(conf.PathDefaults.PublishPass) ||
conf.PathDefaults.ReadUser != nil || conf.PathDefaults.ReadPass != nil || ipNetworkIsNotEmpty(conf.PathDefaults.PublishIPs) ||
conf.PathDefaults.ReadIPs != nil || credentialIsNotEmpty(conf.PathDefaults.ReadUser) ||
credentialIsNotEmpty(conf.PathDefaults.ReadPass) ||
ipNetworkIsNotEmpty(conf.PathDefaults.ReadIPs) ||
anyPathHasDeprecatedCredentials(conf.OptionalPaths) { anyPathHasDeprecatedCredentials(conf.OptionalPaths) {
conf.AuthInternalUsers = []AuthInternalUser{ conf.AuthInternalUsers = []AuthInternalUser{
{ {

12
internal/conf/path.go
View file

@ -383,17 +383,17 @@ func (pconf *Path) validate(
if deprecatedCredentialsMode { if deprecatedCredentialsMode {
func() { func() {
var user Credential = "any" var user Credential = "any"
if pconf.PublishUser != nil { if credentialIsNotEmpty(pconf.PublishUser) {
user = *pconf.PublishUser user = *pconf.PublishUser
} }
var pass Credential var pass Credential
if pconf.PublishPass != nil { if credentialIsNotEmpty(pconf.PublishPass) {
pass = *pconf.PublishPass pass = *pconf.PublishPass
} }
ips := IPNetworks{mustParseCIDR("0.0.0.0/0")} ips := IPNetworks{mustParseCIDR("0.0.0.0/0")}
if pconf.PublishIPs != nil { if ipNetworkIsNotEmpty(pconf.PublishIPs) {
ips = *pconf.PublishIPs ips = *pconf.PublishIPs
} }
@ -415,17 +415,17 @@ func (pconf *Path) validate(
func() { func() {
var user Credential = "any" var user Credential = "any"
if pconf.ReadUser != nil { if credentialIsNotEmpty(pconf.ReadUser) {
user = *pconf.ReadUser user = *pconf.ReadUser
} }
var pass Credential var pass Credential
if pconf.ReadPass != nil { if credentialIsNotEmpty(pconf.ReadPass) {
pass = *pconf.ReadPass pass = *pconf.ReadPass
} }
ips := IPNetworks{mustParseCIDR("0.0.0.0/0")} ips := IPNetworks{mustParseCIDR("0.0.0.0/0")}
if pconf.ReadIPs != nil { if ipNetworkIsNotEmpty(pconf.ReadIPs) {
ips = *pconf.ReadIPs ips = *pconf.ReadIPs
} }