Skip to content
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

Fix vulnerabilities CWE-113 (issue #4208 issue #4209) #4210

Merged
merged 1 commit into from
Jan 9, 2025
Merged

Fix vulnerabilities CWE-113 (issue #4208 issue #4209) #4210

Show file tree
Hide file tree
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
16 changes: 15 additions & 1 deletion agreementbot/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
"github.com/open-horizon/anax/worker"
"io/ioutil"
"net/http"
"regexp"
"sort"
"sync"
"time"
Expand Down Expand Up @@ -318,11 +319,24 @@ func (a *API) listen(apiListen string) {
return
}

isValidInput := func(input string) bool {
// Check for CR or LF characters in input
re := regexp.MustCompile(`[\r\n]`)
return !re.MatchString(input)
}

nocache := func(h http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
w.Header().Add("Cache-Control", "no-cache, no-store, must-revalidate")
w.Header().Add("Pragma", "no-cache, no-store")
w.Header().Add("Access-Control-Allow-Origin", r.Header.Get("Origin"))

input := r.Header.Get("Origin")
if !isValidInput(input) {
http.Error(w, "Input contains invalid newline characters (CR/LF)", http.StatusBadRequest)
return
}

w.Header().Add("Access-Control-Allow-Origin", input)
w.Header().Add("Access-Control-Allow-Headers", "X-Requested-With, content-type, Authorization")
w.Header().Add("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, PATCH, OPTIONS")
h.ServeHTTP(w, r)
Expand Down
16 changes: 15 additions & 1 deletion api/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (
"github.com/open-horizon/anax/policy"
"github.com/open-horizon/anax/worker"
"net/http"
"regexp"
"sync"
)

Expand Down Expand Up @@ -133,11 +134,24 @@ func (a *API) router(includeStaticRedirects bool) *mux.Router {
func (a *API) listen(cfg *config.HorizonConfig) {
glog.Info(apiLogString(fmt.Sprintf("Starting Anax API server")))

isValidInput := func(input string) bool {
// Check for CR or LF characters in input
re := regexp.MustCompile(`[\r\n]`)
return !re.MatchString(input)
}

nocache := func(h http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
w.Header().Add("Cache-Control", "no-cache, no-store, must-revalidate")
w.Header().Add("Pragma", "no-cache, no-store")
w.Header().Add("Access-Control-Allow-Origin", r.Header.Get("Origin"))

input := r.Header.Get("Origin")
if !isValidInput(input) {
http.Error(w, "Input contains invalid newline characters (CR/LF)", http.StatusBadRequest)
return
}

w.Header().Add("Access-Control-Allow-Origin", input)
w.Header().Add("Access-Control-Allow-Headers", "X-Requested-With, content-type, Authorization")
w.Header().Add("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, PATCH, OPTIONS")
h.ServeHTTP(w, r)
Expand Down