Skip to content

Commit

Permalink
Merge pull request #510 from jmpsec/environment-only-uuid
Browse files Browse the repository at this point in the history 
Using only UUID to identify environment in osctrl-tls
  • Loading branch information
@javuto
javuto authored Sep 16, 2024
2 parents c04a712 + e5b2894 commit 07b07e3
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 14 deletions.
27 changes: 27 additions & 0 deletions environments/environments.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,33 @@ func (environment *Environment) Get(identifier string) (TLSEnvironment, error) {
return env, nil
}

// Get TLS Environment by UUID
func (environment *Environment) GetByUUID(uuid string) (TLSEnvironment, error) {
var env TLSEnvironment
if err := environment.DB.Where("uuid = ?", uuid).First(&env).Error; err != nil {
return env, err
}
return env, nil
}

// Get TLS Environment by Name
func (environment *Environment) GetByName(name string) (TLSEnvironment, error) {
var env TLSEnvironment
if err := environment.DB.Where("name = ?", name).First(&env).Error; err != nil {
return env, err
}
return env, nil
}

// Get TLS Environment by ID
func (environment *Environment) GetByID(id uint) (TLSEnvironment, error) {
var env TLSEnvironment
if err := environment.DB.Where("ID = ?", id).First(&env).Error; err != nil {
return env, err
}
return env, nil
}

// Empty generates an empty TLSEnvironment with default values
func (environment *Environment) Empty(name, hostname string) TLSEnvironment {
return TLSEnvironment{
Expand Down
28 changes: 14 additions & 14 deletions tls/handlers/post.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func (h *HandlersTLS) EnrollHandler(w http.ResponseWriter, r *http.Request) {
return
}
// Get environment
env, err := h.Envs.Get(envVar)
env, err := h.Envs.GetByUUID(envVar)
if err != nil {
h.Inc(metricEnrollErr)
log.Printf("error getting environment %v", err)
Expand Down Expand Up @@ -117,7 +117,7 @@ func (h *HandlersTLS) ConfigHandler(w http.ResponseWriter, r *http.Request) {
return
}
// Get environment
env, err := h.Envs.Get(envVar)
env, err := h.Envs.GetByUUID(envVar)
if err != nil {
h.Inc(metricConfigErr)
log.Printf("error getting environment %v", err)
Expand Down Expand Up @@ -183,7 +183,7 @@ func (h *HandlersTLS) LogHandler(w http.ResponseWriter, r *http.Request) {
return
}
// Get environment
env, err := h.Envs.Get(envVar)
env, err := h.Envs.GetByUUID(envVar)
if err != nil {
h.Inc(metricLogErr)
log.Printf("error getting environment %v", err)
Expand Down Expand Up @@ -261,7 +261,7 @@ func (h *HandlersTLS) QueryReadHandler(w http.ResponseWriter, r *http.Request) {
return
}
// Get environment
env, err := h.Envs.Get(envVar)
env, err := h.Envs.GetByUUID(envVar)
if err != nil {
h.Inc(metricReadErr)
log.Printf("error getting environment %v", err)
Expand Down Expand Up @@ -340,7 +340,7 @@ func (h *HandlersTLS) QueryWriteHandler(w http.ResponseWriter, r *http.Request)
return
}
// Get environment
env, err := h.Envs.Get(envVar)
env, err := h.Envs.GetByUUID(envVar)
if err != nil {
h.Inc(metricWriteErr)
log.Printf("error getting environment %v", err)
Expand Down Expand Up @@ -419,7 +419,7 @@ func (h *HandlersTLS) QuickEnrollHandler(w http.ResponseWriter, r *http.Request)
return
}
// Get environment
env, err := h.Envs.Get(envVar)
env, err := h.Envs.GetByUUID(envVar)
if err != nil {
h.Inc(metricOnelinerErr)
log.Printf("error getting environment - %v", err)
Expand Down Expand Up @@ -496,7 +496,7 @@ func (h *HandlersTLS) QuickRemoveHandler(w http.ResponseWriter, r *http.Request)
return
}
// Get environment
env, err := h.Envs.Get(envVar)
env, err := h.Envs.GetByUUID(envVar)
if err != nil {
h.Inc(metricOnelinerErr)
log.Printf("error getting environment - %v", err)
Expand Down Expand Up @@ -575,7 +575,7 @@ func (h *HandlersTLS) CarveInitHandler(w http.ResponseWriter, r *http.Request) {
return
}
// Get environment
env, err := h.Envs.Get(envVar)
env, err := h.Envs.GetByUUID(envVar)
if err != nil {
h.Inc(metricInitErr)
log.Printf("error getting environment %v", err)
Expand Down Expand Up @@ -646,7 +646,7 @@ func (h *HandlersTLS) CarveBlockHandler(w http.ResponseWriter, r *http.Request)
return
}
// Get environment
env, err := h.Envs.Get(envVar)
env, err := h.Envs.GetByUUID(envVar)
if err != nil {
h.Inc(metricBlockErr)
log.Printf("error getting environment %v", err)
Expand Down Expand Up @@ -706,7 +706,7 @@ func (h *HandlersTLS) FlagsHandler(w http.ResponseWriter, r *http.Request) {
return
}
// Get environment
env, err := h.Envs.Get(envVar)
env, err := h.Envs.GetByUUID(envVar)
if err != nil {
h.Inc(metricFlagsErr)
log.Printf("error getting environment %v", err)
Expand Down Expand Up @@ -761,7 +761,7 @@ func (h *HandlersTLS) CertHandler(w http.ResponseWriter, r *http.Request) {
return
}
// Get environment
env, err := h.Envs.Get(envVar)
env, err := h.Envs.GetByUUID(envVar)
if err != nil {
h.Inc(metricCertErr)
log.Printf("error getting environment %v", err)
Expand Down Expand Up @@ -810,7 +810,7 @@ func (h *HandlersTLS) VerifyHandler(w http.ResponseWriter, r *http.Request) {
return
}
// Get environment
env, err := h.Envs.Get(envVar)
env, err := h.Envs.GetByUUID(envVar)
if err != nil {
h.Inc(metricVerifyErr)
log.Printf("error getting environment %v", err)
Expand Down Expand Up @@ -869,7 +869,7 @@ func (h *HandlersTLS) ScriptHandler(w http.ResponseWriter, r *http.Request) {
return
}
// Get environment
env, err := h.Envs.Get(envVar)
env, err := h.Envs.GetByUUID(envVar)
if err != nil {
h.Inc(metricScriptErr)
log.Printf("error getting environment %v", err)
Expand Down Expand Up @@ -949,7 +949,7 @@ func (h *HandlersTLS) EnrollPackageHandler(w http.ResponseWriter, r *http.Reques
return
}
// Get environment
env, err := h.Envs.Get(envVar)
env, err := h.Envs.GetByUUID(envVar)
if err != nil {
h.Inc(metricPackageErr)
log.Printf("error getting environment - %v", err)
Expand Down

0 comments on commit 07b07e3

Please sign in to comment.