mirror of
https://github.com/ossrs/srs.git
synced 2025-03-09 15:49:59 +00:00
API: Support HTTP basic authentication for API. v6.0.4, v5.0.152 (#3458)
Co-authored-by: winlin <winlin@vip.126.com> Co-authored-by: john <hondaxiao@tencent.com>
This commit is contained in:
parent
571043ff3d
commit
771ae0a1a6
15 changed files with 660 additions and 50 deletions
93
trunk/3rdparty/srs-bench/blackbox/http_api_test.go
vendored
Normal file
93
trunk/3rdparty/srs-bench/blackbox/http_api_test.go
vendored
Normal file
|
@ -0,0 +1,93 @@
|
|||
// The MIT License (MIT)
|
||||
//
|
||||
// # Copyright (c) 2023 Winlin
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||
// this software and associated documentation files (the "Software"), to deal in
|
||||
// the Software without restriction, including without limitation the rights to
|
||||
// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
|
||||
// the Software, and to permit persons to whom the Software is furnished to do so,
|
||||
// subject to the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be included in all
|
||||
// copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
|
||||
// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
|
||||
// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
|
||||
// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
package blackbox
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"github.com/ossrs/go-oryx-lib/errors"
|
||||
"github.com/ossrs/go-oryx-lib/logger"
|
||||
"net/http"
|
||||
"sync"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
func TestFast_Http_Api_Basic_Auth(t *testing.T) {
|
||||
// This case is run in parallel.
|
||||
t.Parallel()
|
||||
|
||||
// Setup the max timeout for this case.
|
||||
ctx, cancel := context.WithTimeout(logger.WithContext(context.Background()), time.Duration(*srsTimeout)*time.Millisecond)
|
||||
defer cancel()
|
||||
|
||||
// Check a set of errors.
|
||||
var r0, r1, r2, r3, r4, r5, r6 error
|
||||
defer func(ctx context.Context) {
|
||||
if err := filterTestError(ctx.Err(), r0, r1, r2, r3, r4, r5, r6); err != nil {
|
||||
t.Errorf("Fail for err %+v", err)
|
||||
} else {
|
||||
logger.Tf(ctx, "test done with err %+v", err)
|
||||
}
|
||||
}(ctx)
|
||||
|
||||
var wg sync.WaitGroup
|
||||
defer wg.Wait()
|
||||
|
||||
// Start SRS server and wait for it to be ready.
|
||||
svr := NewSRSServer(func(v *srsServer) {
|
||||
v.envs = []string{
|
||||
"SRS_HTTP_API_AUTH_ENABLED=on",
|
||||
"SRS_HTTP_API_AUTH_USERNAME=admin",
|
||||
"SRS_HTTP_API_AUTH_PASSWORD=admin",
|
||||
}
|
||||
})
|
||||
wg.Add(1)
|
||||
go func() {
|
||||
defer wg.Done()
|
||||
r0 = svr.Run(ctx, cancel)
|
||||
}()
|
||||
|
||||
<-svr.ReadyCtx().Done()
|
||||
|
||||
if true {
|
||||
defer cancel()
|
||||
|
||||
var res *http.Response
|
||||
url := fmt.Sprintf("http://admin:admin@localhost:%v/api/v1/versions", svr.APIPort())
|
||||
res, r1 = http.Get(url)
|
||||
if r1 == nil && res.StatusCode != 200 {
|
||||
r2 = errors.Errorf("get status code=%v, expect=200", res.StatusCode)
|
||||
}
|
||||
|
||||
url = fmt.Sprintf("http://admin:123456@localhost:%v/api/v1/versions", svr.APIPort())
|
||||
res, r3 = http.Get(url)
|
||||
if r3 == nil && res.StatusCode != 401 {
|
||||
r4 = errors.Errorf("get status code=%v, expect=401", res.StatusCode)
|
||||
}
|
||||
|
||||
url = fmt.Sprintf("http://localhost:%v/api/v1/versions", svr.APIPort())
|
||||
res, r5 = http.Get(url)
|
||||
if r5 == nil && res.StatusCode != 401 {
|
||||
r6 = errors.Errorf("get status code=%v, expect=401", res.StatusCode)
|
||||
}
|
||||
}
|
||||
}
|
36
trunk/3rdparty/srs-bench/blackbox/util.go
vendored
36
trunk/3rdparty/srs-bench/blackbox/util.go
vendored
|
@ -329,7 +329,7 @@ func (v *backendService) Run(ctx context.Context, cancel context.CancelFunc) err
|
|||
}
|
||||
|
||||
select {
|
||||
case <- ctx.Done():
|
||||
case <-ctx.Done():
|
||||
case <-time.After(v.duration):
|
||||
logger.Tf(ctx, "Process killed duration=%v, pid=%v, name=%v, args=%v", v.duration, v.pid, v.name, v.args)
|
||||
cmd.Process.Kill()
|
||||
|
@ -418,6 +418,8 @@ type SRSServer interface {
|
|||
RTMPPort() int
|
||||
// HTTPPort is the HTTP stream port.
|
||||
HTTPPort() int
|
||||
// APIPort is the HTTP API port.
|
||||
APIPort() int
|
||||
// SRTPort is the SRT UDP port.
|
||||
SRTPort() int
|
||||
}
|
||||
|
@ -510,6 +512,10 @@ func (v *srsServer) HTTPPort() int {
|
|||
return v.httpListen
|
||||
}
|
||||
|
||||
func (v *srsServer) APIPort() int {
|
||||
return v.apiListen
|
||||
}
|
||||
|
||||
func (v *srsServer) SRTPort() int {
|
||||
return v.srtListen
|
||||
}
|
||||
|
@ -524,7 +530,7 @@ func (v *srsServer) Run(ctx context.Context, cancel context.CancelFunc) error {
|
|||
)
|
||||
|
||||
// Create directories.
|
||||
if err := os.MkdirAll(path.Join(v.workDir, "./objs/nginx/html"), os.FileMode(0755) | os.ModeDir); err != nil {
|
||||
if err := os.MkdirAll(path.Join(v.workDir, "./objs/nginx/html"), os.FileMode(0755)|os.ModeDir); err != nil {
|
||||
return errors.Wrapf(err, "SRS create directory %v", path.Join(v.workDir, "./objs/nginx/html"))
|
||||
}
|
||||
|
||||
|
@ -657,7 +663,7 @@ type ffmpegClient struct {
|
|||
|
||||
func NewFFmpeg(opts ...func(v *ffmpegClient)) FFmpegClient {
|
||||
v := &ffmpegClient{
|
||||
process: newBackendService(),
|
||||
process: newBackendService(),
|
||||
cancelCaseWhenQuit: true,
|
||||
}
|
||||
|
||||
|
@ -701,7 +707,7 @@ func (v *ffmpegClient) Run(ctx context.Context, cancel context.CancelFunc) error
|
|||
ffCtx, ffCancel := context.WithCancel(ctx)
|
||||
go func() {
|
||||
select {
|
||||
case <- ctx.Done():
|
||||
case <-ctx.Done():
|
||||
case <-ffCtx.Done():
|
||||
if v.cancelCaseWhenQuit {
|
||||
cancel()
|
||||
|
@ -1144,17 +1150,17 @@ func (v *HooksEventBase) HookAction() string {
|
|||
|
||||
type HooksEventOnDvr struct {
|
||||
HooksEventBase
|
||||
Stream string `json:"stream"`
|
||||
Stream string `json:"stream"`
|
||||
StreamUrl string `json:"stream_url"`
|
||||
StreamID string `json:"stream_id"`
|
||||
CWD string `json:"cwd"`
|
||||
File string `json:"file"`
|
||||
TcUrl string `json:"tcUrl"`
|
||||
App string `json:"app"`
|
||||
Vhost string `json:"vhost"`
|
||||
IP string `json:"ip"`
|
||||
ClientIP string `json:"client_id"`
|
||||
ServerID string `json:"server_id"`
|
||||
StreamID string `json:"stream_id"`
|
||||
CWD string `json:"cwd"`
|
||||
File string `json:"file"`
|
||||
TcUrl string `json:"tcUrl"`
|
||||
App string `json:"app"`
|
||||
Vhost string `json:"vhost"`
|
||||
IP string `json:"ip"`
|
||||
ClientIP string `json:"client_id"`
|
||||
ServerID string `json:"server_id"`
|
||||
}
|
||||
|
||||
type HooksService interface {
|
||||
|
@ -1171,7 +1177,7 @@ type hooksService struct {
|
|||
httpPort int
|
||||
dispose func()
|
||||
|
||||
r0 error
|
||||
r0 error
|
||||
hooksOnDvr chan HooksEvent
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue