iridium/neko
2
2
Fork 0
mirror of https://github.com/m1k1o/neko.git synced 2024-07-24 14:40:50 +12:00
Code Issues Packages Projects Releases Wiki Activity

auth moved from websockets to session.

Browse Source
This commit is contained in:
Miroslav Šedivý
2020-11-01 18:39:12 +01:00
parent 3ea979ed47
commit c10b2212d1
8 changed files with 65 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
internal/config/server.go
View File

@ -10,6 +10,7 @@ type Server struct {
Key string
Bind string
Static string
//Proxy bool
UserToken string
AdminToken string
}
@ -35,6 +36,11 @@ func (Server) Init(cmd *cobra.Command) error {
return err
}
//cmd.PersistentFlags().Bool("proxy", false, "allow reverse proxies")
//if err := viper.BindPFlag("proxy", cmd.PersistentFlags().Lookup("proxy")); err != nil {
// return err
//}
cmd.PersistentFlags().String("user_token", "user_secret", "JWT token for users")
if err := viper.BindPFlag("user_token", cmd.PersistentFlags().Lookup("user_token")); err != nil {
return err
@ -53,6 +59,7 @@ func (s *Server) Set() {
s.Key = viper.GetString("key")
s.Bind = viper.GetString("bind")
s.Static = viper.GetString("static")
//s.Proxy = viper.GetBool("proxy")
s.UserToken = viper.GetString("user_token")
s.AdminToken = viper.GetString("admin_token")
}

13
internal/config/websocket.go → internal/config/session.go
View File

@ -5,13 +5,12 @@ import (
"github.com/spf13/viper"
)
type WebSocket struct {
type Session struct {
Password string
AdminPassword string
Proxy bool
}
func (WebSocket) Init(cmd *cobra.Command) error {
func (Session) Init(cmd *cobra.Command) error {
cmd.PersistentFlags().String("password", "neko", "password for connecting to stream")
if err := viper.BindPFlag("password", cmd.PersistentFlags().Lookup("password")); err != nil {
return err
@ -22,16 +21,10 @@ func (WebSocket) Init(cmd *cobra.Command) error {
return err
}
cmd.PersistentFlags().Bool("proxy", false, "enable reverse proxy mode")
if err := viper.BindPFlag("proxy", cmd.PersistentFlags().Lookup("proxy")); err != nil {
return err
}
return nil
}
func (s *WebSocket) Set() {
func (s *Session) Set() {
s.Password = viper.GetString("password")
s.AdminPassword = viper.GetString("password_admin")
s.Proxy = viper.GetBool("proxy")
}