IntenseWebs/boringproxy
3
0
Fork 0
mirror of https://github.com/boringproxy/boringproxy.git synced 2025-02-25 18:55:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

Improve waygate names some more

Browse Source
This commit is contained in:
Anders Pitman 2022-03-04 14:00:04 -07:00
parent 6e970434fc
commit 1832e99e22
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api.go
View File

@ -46,7 +46,7 @@ func (a *Api) handleTunnels(w http.ResponseWriter, r *http.Request) {
return return
} }
tokenData, exists := a.db.GetTokenData(token) tokenData, exists := a.db.GetLegacyTokenData(token)
if !exists { if !exists {
w.WriteHeader(403) w.WriteHeader(403)
w.Write([]byte("Not authorized")) w.Write([]byte("Not authorized"))
@ -141,7 +141,7 @@ func (a *Api) handleUsers(w http.ResponseWriter, r *http.Request) {
return return
} }
tokenData, exists := a.db.GetTokenData(token) tokenData, exists := a.db.GetLegacyTokenData(token)
if !exists { if !exists {
w.WriteHeader(401) w.WriteHeader(401)
io.WriteString(w, "Failed to get token") io.WriteString(w, "Failed to get token")
@ -179,7 +179,7 @@ func (a *Api) handleTokens(w http.ResponseWriter, r *http.Request) {
return return
} }
tokenData, exists := a.db.GetTokenData(token) tokenData, exists := a.db.GetLegacyTokenData(token)
if !exists { if !exists {
w.WriteHeader(403) w.WriteHeader(403)
w.Write([]byte("Not authorized")) w.Write([]byte("Not authorized"))
@ -219,7 +219,7 @@ func (a *Api) handleClients(w http.ResponseWriter, r *http.Request) {
return return
} }
tokenData, exists := a.db.GetTokenData(token) tokenData, exists := a.db.GetLegacyTokenData(token)
if !exists { if !exists {
w.WriteHeader(403) w.WriteHeader(403)
w.Write([]byte("Not authorized")) w.Write([]byte("Not authorized"))
@ -478,7 +478,7 @@ func (a *Api) DeleteToken(tokenData TokenData, params url.Values) error {
return errors.New("Invalid token parameter") return errors.New("Invalid token parameter")
} }
delTokenData, exists := a.db.GetTokenData(token) delTokenData, exists := a.db.GetLegacyTokenData(token)
if !exists { if !exists {
return errors.New("Token doesn't exist") return errors.New("Token doesn't exist")
} }

2
auth.go
View File

@ -23,7 +23,7 @@ func NewAuth(db *Database) *Auth {
} }
func (a *Auth) Authorized(token string) bool { func (a *Auth) Authorized(token string) bool {
_, exists := a.db.GetTokenData(token) _, exists := a.db.GetLegacyTokenData(token)
if exists { if exists {
return true return true

14
database.go
View File

@ -20,7 +20,7 @@ type Database struct {
Users map[string]User `json:"users"` Users map[string]User `json:"users"`
dnsRequests map[string]namedrop.DNSRequest `json:"dns_requests"` dnsRequests map[string]namedrop.DNSRequest `json:"dns_requests"`
Waygates map[string]waygate.Waygate `json:"waygates"` Waygates map[string]waygate.Waygate `json:"waygates"`
WaygateTokens map[string]waygate.Token `json:"waygate_tokens"` WaygateTokens map[string]waygate.TokenData `json:"waygate_tokens"`
waygateCodes map[string]string `json:"waygate_codes"` waygateCodes map[string]string `json:"waygate_codes"`
mutex *sync.Mutex mutex *sync.Mutex
} }
@ -104,7 +104,7 @@ func NewDatabase(path string) (*Database, error) {
db.Waygates = make(map[string]waygate.Waygate) db.Waygates = make(map[string]waygate.Waygate)
} }
if db.WaygateTokens == nil { if db.WaygateTokens == nil {
db.WaygateTokens = make(map[string]waygate.Token) db.WaygateTokens = make(map[string]waygate.TokenData)
} }
if db.waygateCodes == nil { if db.waygateCodes == nil {
db.waygateCodes = make(map[string]string) db.waygateCodes = make(map[string]string)
@ -198,7 +198,7 @@ func (d *Database) GetTokens() map[string]TokenData {
return tokens return tokens
} }
func (d *Database) GetTokenData(token string) (TokenData, bool) { func (d *Database) GetLegacyTokenData(token string) (TokenData, bool) {
d.mutex.Lock() d.mutex.Lock()
defer d.mutex.Unlock() defer d.mutex.Unlock()
@ -357,7 +357,7 @@ func (d *Database) AddWaygateTunnel(domains []string) (string, error) {
return id, nil return id, nil
} }
func (d *Database) GetWaygateTunnel(id string) (waygate.Waygate, error) { func (d *Database) GetWaygate(id string) (waygate.Waygate, error) {
d.mutex.Lock() d.mutex.Lock()
defer d.mutex.Unlock() defer d.mutex.Unlock()
@ -395,7 +395,7 @@ func (d *Database) AddWaygateToken(waygateId string) (string, error) {
return "", errors.New("No such waygate") return "", errors.New("No such waygate")
} }
tokenData := waygate.Token{ tokenData := waygate.TokenData{
WaygateId: waygateId, WaygateId: waygateId,
} }
@ -405,13 +405,13 @@ func (d *Database) AddWaygateToken(waygateId string) (string, error) {
return token, nil return token, nil
} }
func (d *Database) GetWaygateToken(id string) (waygate.Token, error) { func (d *Database) GetTokenData(id string) (waygate.TokenData, error) {
d.mutex.Lock() d.mutex.Lock()
defer d.mutex.Unlock() defer d.mutex.Unlock()
token, exists := d.WaygateTokens[id] token, exists := d.WaygateTokens[id]
if !exists { if !exists {
return waygate.Token{}, errors.New("No such token") return waygate.TokenData{}, errors.New("No such token")
} }
return token, nil return token, nil

2
ui_handler.go
View File

@ -85,7 +85,7 @@ func (h *WebUiHandler) handleWebUiRequest(w http.ResponseWriter, r *http.Request
return return
} }
tokenData, exists := h.db.GetTokenData(token) tokenData, exists := h.db.GetLegacyTokenData(token)
if !exists { if !exists {
h.sendLoginPage(w, r, 403) h.sendLoginPage(w, r, 403)
return return