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

Rename some things

Browse Source
This commit is contained in:
Anders Pitman 2022-03-04 13:02:48 -07:00
parent 29074f9cd0
commit 31e2eb2687
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
database.go
View File

@ -14,15 +14,15 @@ import (
var DBFolderPath string var DBFolderPath string
type Database struct { type Database struct {
AdminDomain string `json:"admin_domain"` AdminDomain string `json:"admin_domain"`
Tokens map[string]TokenData `json:"tokens"` Tokens map[string]TokenData `json:"tokens"`
Tunnels map[string]Tunnel `json:"tunnels"` Tunnels map[string]Tunnel `json:"tunnels"`
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"`
WaygateTunnels map[string]waygate.WaygateTunnel `json:"waygate_tunnels"` WaygateTunnels map[string]waygate.WaygateTunnel `json:"waygate_tunnels"`
WaygateTokens map[string]waygate.WaygateToken `json:"waygate_tokens"` WaygateTokens map[string]waygate.Token `json:"waygate_tokens"`
WaygatePendingTokens map[string]string `json:"waygate_pending_tokens"` waygateCodes map[string]string `json:"waygate_codes"`
mutex *sync.Mutex mutex *sync.Mutex
} }
type TokenData struct { type TokenData struct {
@ -104,10 +104,10 @@ func NewDatabase(path string) (*Database, error) {
db.WaygateTunnels = make(map[string]waygate.WaygateTunnel) db.WaygateTunnels = make(map[string]waygate.WaygateTunnel)
} }
if db.WaygateTokens == nil { if db.WaygateTokens == nil {
db.WaygateTokens = make(map[string]waygate.WaygateToken) db.WaygateTokens = make(map[string]waygate.Token)
} }
if db.WaygatePendingTokens == nil { if db.waygateCodes == nil {
db.WaygatePendingTokens = make(map[string]string) db.waygateCodes = make(map[string]string)
} }
db.mutex = &sync.Mutex{} db.mutex = &sync.Mutex{}
@ -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.WaygateToken{ tokenData := waygate.Token{
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.WaygateToken, error) { func (d *Database) GetWaygateToken(id string) (waygate.Token, 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.WaygateToken{}, errors.New("No such token") return waygate.Token{}, errors.New("No such token")
} }
return token, nil return token, nil
@ -426,7 +426,7 @@ func (d *Database) SetTokenCode(token, code string) error {
return errors.New("No such token") return errors.New("No such token")
} }
d.WaygatePendingTokens[code] = token d.waygateCodes[code] = token
d.persist() d.persist()
@ -436,12 +436,12 @@ func (d *Database) GetTokenByCode(code string) (string, error) {
d.mutex.Lock() d.mutex.Lock()
defer d.mutex.Unlock() defer d.mutex.Unlock()
token, exists := d.WaygatePendingTokens[code] token, exists := d.waygateCodes[code]
if !exists { if !exists {
return "", errors.New("No such code") return "", errors.New("No such code")
} }
delete(d.WaygatePendingTokens, code) delete(d.waygateCodes, code)
d.persist() d.persist()