2017-09-23 08:56:58 +03:00
|
|
|
// Copyright 2015 Light Code Labs, LLC
|
|
|
|
//
|
|
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
// you may not use this file except in compliance with the License.
|
|
|
|
// You may obtain a copy of the License at
|
|
|
|
//
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
//
|
|
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
// See the License for the specific language governing permissions and
|
|
|
|
// limitations under the License.
|
|
|
|
|
2017-06-24 23:54:35 +03:00
|
|
|
package requestid
|
|
|
|
|
|
|
|
import (
|
fix lint warnings (issue 2541) (#2551)
* Lint: fix some errcheck #2541
* Lint: fix passing structcheck #2541
* Lint: update fix structcheck #2541
* Lint: fix errcheck for basicauth, browse, fastcgi_test #2541
* Lint: fix errcheck for browse, fastcgi_test, fcgiclient, fcgiclient_test #2541
* Lint: fix errcheck for responsefilter_test, fcgilient_test #2541
* Lint: fix errcheck for header_test #2541
* Lint: update errcheck for fcgiclient_test #2541
* Lint: fix errcheck for server, header_test, fastcgi_test, https_test, recorder_test #2541
* Lint: fix errcheck for tplcontext, vhosttrie_test, internal_test, handler_test #2541
* Lint: fix errcheck for log_test, markdown mholt#2541
* Lint: fix errcheck for policy, body_test, proxy_test #2541
* Lint: fix errcheck for on multiple packages #2541
- reverseproxy
- reverseproxy_test
- upstream
- upstream_test
- body_test
* Lint: fix errcheck in multiple packages mholt#2541
- handler_test
- redirect_test
- requestid_test
- rewrite_test
- fileserver_test
* Lint: fix errcheck in multiple packages mholt#2541
- websocket
- setup
- collection
- redirect_test
- templates_test
* Lint: fix errcheck in logger test #2541
run goimports against #2551
- lexer_test
- log_test
- markdown
* Update caddyhttp/httpserver/logger_test.go
Co-Authored-By: Inconnu08 <taufiqrx8@gmail.com>
* Update log_test.go
* Lint: fix scope in logger_test #2541
* remove redundant err check in logger_test #2541
* fix alias in logger_test #2541
* fix import for format #2541
* refactor variable names and error check #2541
2019-04-22 19:20:37 +03:00
|
|
|
"log"
|
2017-06-24 23:54:35 +03:00
|
|
|
"net/http"
|
2018-02-03 05:59:28 +03:00
|
|
|
"net/http/httptest"
|
2017-06-24 23:54:35 +03:00
|
|
|
"testing"
|
|
|
|
|
|
|
|
"github.com/mholt/caddy/caddyhttp/httpserver"
|
|
|
|
)
|
|
|
|
|
2018-02-03 05:59:28 +03:00
|
|
|
func TestRequestIDHandler(t *testing.T) {
|
|
|
|
handler := Handler{
|
|
|
|
Next: httpserver.HandlerFunc(func(w http.ResponseWriter, r *http.Request) (int, error) {
|
|
|
|
value, _ := r.Context().Value(httpserver.RequestIDCtxKey).(string)
|
|
|
|
if value == "" {
|
|
|
|
t.Error("Request ID should not be empty")
|
|
|
|
}
|
|
|
|
return 0, nil
|
|
|
|
}),
|
|
|
|
}
|
|
|
|
|
|
|
|
req, err := http.NewRequest("GET", "http://localhost/", nil)
|
2017-06-24 23:54:35 +03:00
|
|
|
if err != nil {
|
|
|
|
t.Fatal("Could not create HTTP request:", err)
|
|
|
|
}
|
2018-02-03 05:59:28 +03:00
|
|
|
rec := httptest.NewRecorder()
|
2017-06-24 23:54:35 +03:00
|
|
|
|
fix lint warnings (issue 2541) (#2551)
* Lint: fix some errcheck #2541
* Lint: fix passing structcheck #2541
* Lint: update fix structcheck #2541
* Lint: fix errcheck for basicauth, browse, fastcgi_test #2541
* Lint: fix errcheck for browse, fastcgi_test, fcgiclient, fcgiclient_test #2541
* Lint: fix errcheck for responsefilter_test, fcgilient_test #2541
* Lint: fix errcheck for header_test #2541
* Lint: update errcheck for fcgiclient_test #2541
* Lint: fix errcheck for server, header_test, fastcgi_test, https_test, recorder_test #2541
* Lint: fix errcheck for tplcontext, vhosttrie_test, internal_test, handler_test #2541
* Lint: fix errcheck for log_test, markdown mholt#2541
* Lint: fix errcheck for policy, body_test, proxy_test #2541
* Lint: fix errcheck for on multiple packages #2541
- reverseproxy
- reverseproxy_test
- upstream
- upstream_test
- body_test
* Lint: fix errcheck in multiple packages mholt#2541
- handler_test
- redirect_test
- requestid_test
- rewrite_test
- fileserver_test
* Lint: fix errcheck in multiple packages mholt#2541
- websocket
- setup
- collection
- redirect_test
- templates_test
* Lint: fix errcheck in logger test #2541
run goimports against #2551
- lexer_test
- log_test
- markdown
* Update caddyhttp/httpserver/logger_test.go
Co-Authored-By: Inconnu08 <taufiqrx8@gmail.com>
* Update log_test.go
* Lint: fix scope in logger_test #2541
* remove redundant err check in logger_test #2541
* fix alias in logger_test #2541
* fix import for format #2541
* refactor variable names and error check #2541
2019-04-22 19:20:37 +03:00
|
|
|
if _, err := handler.ServeHTTP(rec, req); err != nil {
|
|
|
|
log.Println("[ERROR] failed to serve HTTP: ", err)
|
|
|
|
}
|
2018-02-03 05:59:28 +03:00
|
|
|
}
|
2017-06-24 23:54:35 +03:00
|
|
|
|
2018-02-03 05:59:28 +03:00
|
|
|
func TestRequestIDFromHeader(t *testing.T) {
|
|
|
|
headerName := "X-Request-ID"
|
|
|
|
headerValue := "71a75329-d9f9-4d25-957e-e689a7b68d78"
|
|
|
|
handler := Handler{
|
|
|
|
Next: httpserver.HandlerFunc(func(w http.ResponseWriter, r *http.Request) (int, error) {
|
|
|
|
value, _ := r.Context().Value(httpserver.RequestIDCtxKey).(string)
|
|
|
|
if value != headerValue {
|
|
|
|
t.Errorf("Request ID should be '%s' but got '%s'", headerValue, value)
|
|
|
|
}
|
|
|
|
return 0, nil
|
|
|
|
}),
|
|
|
|
HeaderName: headerName,
|
2017-06-24 23:54:35 +03:00
|
|
|
}
|
|
|
|
|
2018-02-03 05:59:28 +03:00
|
|
|
req, err := http.NewRequest("GET", "http://localhost/", nil)
|
|
|
|
if err != nil {
|
|
|
|
t.Fatal("Could not create HTTP request:", err)
|
2017-06-24 23:54:35 +03:00
|
|
|
}
|
2018-02-03 05:59:28 +03:00
|
|
|
req.Header.Set(headerName, headerValue)
|
|
|
|
rec := httptest.NewRecorder()
|
|
|
|
|
fix lint warnings (issue 2541) (#2551)
* Lint: fix some errcheck #2541
* Lint: fix passing structcheck #2541
* Lint: update fix structcheck #2541
* Lint: fix errcheck for basicauth, browse, fastcgi_test #2541
* Lint: fix errcheck for browse, fastcgi_test, fcgiclient, fcgiclient_test #2541
* Lint: fix errcheck for responsefilter_test, fcgilient_test #2541
* Lint: fix errcheck for header_test #2541
* Lint: update errcheck for fcgiclient_test #2541
* Lint: fix errcheck for server, header_test, fastcgi_test, https_test, recorder_test #2541
* Lint: fix errcheck for tplcontext, vhosttrie_test, internal_test, handler_test #2541
* Lint: fix errcheck for log_test, markdown mholt#2541
* Lint: fix errcheck for policy, body_test, proxy_test #2541
* Lint: fix errcheck for on multiple packages #2541
- reverseproxy
- reverseproxy_test
- upstream
- upstream_test
- body_test
* Lint: fix errcheck in multiple packages mholt#2541
- handler_test
- redirect_test
- requestid_test
- rewrite_test
- fileserver_test
* Lint: fix errcheck in multiple packages mholt#2541
- websocket
- setup
- collection
- redirect_test
- templates_test
* Lint: fix errcheck in logger test #2541
run goimports against #2551
- lexer_test
- log_test
- markdown
* Update caddyhttp/httpserver/logger_test.go
Co-Authored-By: Inconnu08 <taufiqrx8@gmail.com>
* Update log_test.go
* Lint: fix scope in logger_test #2541
* remove redundant err check in logger_test #2541
* fix alias in logger_test #2541
* fix import for format #2541
* refactor variable names and error check #2541
2019-04-22 19:20:37 +03:00
|
|
|
if _, err := handler.ServeHTTP(rec, req); err != nil {
|
|
|
|
log.Println("[ERROR] failed to serve HTTP: ", err)
|
|
|
|
}
|
2017-06-24 23:54:35 +03:00
|
|
|
}
|