Skip to content

fix: don't validate policy and response if there's no matching route #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
adrienyhuel wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: don't validate policy and response if there's no matching route #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 21 additions & 17 deletions handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,25 +77,28 @@ func (oapi OpenAPI) ServeHTTP(w http.ResponseWriter, req *http.Request, next cad
}
}

if query, exists := resolvePolicy(route, req.Method); exists {
result, err := evalPolicy(query, oapi.policy, req, pathParams)
if nil != err {
replacer.Set(OPENAPI_ERROR, err.Error())
replacer.Set(OPENAPI_STATUS_CODE, 403)
if oapi.LogError {
oapi.err(err.Error())
// don't check if we have a 404 on the route
if nil == err {
if query, exists := resolvePolicy(route, req.Method); exists {
result, err := evalPolicy(query, oapi.policy, req, pathParams)
if nil != err {
replacer.Set(OPENAPI_ERROR, err.Error())
replacer.Set(OPENAPI_STATUS_CODE, 403)
if oapi.LogError {
oapi.err(err.Error())
}
return nil
}
return nil
}

if !result {
err = fmt.Errorf("Denied: %s", query)
replacer.Set(OPENAPI_ERROR, err.Error())
replacer.Set(OPENAPI_STATUS_CODE, 403)
if oapi.LogError {
oapi.err(err.Error())
if !result {
err = fmt.Errorf("Denied: %s", query)
replacer.Set(OPENAPI_ERROR, err.Error())
replacer.Set(OPENAPI_STATUS_CODE, 403)
if oapi.LogError {
oapi.err(err.Error())
}
return err
}
return err
}
}

Expand All @@ -104,7 +107,8 @@ func (oapi OpenAPI) ServeHTTP(w http.ResponseWriter, req *http.Request, next cad
return err
}

if nil != oapi.contentMap {
// if oapi route is nil we don't have check response
if (nil != route) && (nil != oapi.contentMap) {
contentType := w.Header().Get("Content-Type")
if "" == contentType {
return nil
Expand Down