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.

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

Add configuration to forward HTTP headers #196

Merged
merged 3 commits into from
Aug 3, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions cmd/server/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@ import (

"github.com/gorilla/securecookie"
"github.com/gorilla/sessions"
"github.com/temporalio/ui-server/v2/plugins/forwardheaders"
"github.com/temporalio/ui-server/v2/plugins/fs_config_provider"
"github.com/temporalio/ui-server/v2/server"
"github.com/temporalio/ui-server/v2/server/api"
"github.com/temporalio/ui-server/v2/server/server_options"
"github.com/temporalio/ui-server/v2/server/version"
"github.com/urfave/cli/v2"
Expand Down Expand Up @@ -91,6 +93,9 @@ func buildCLI() *cli.App {

opts := []server_options.ServerOption{
server_options.WithConfigProvider(cfgProvider),
server_options.WithAPIMiddleware([]api.Middleware{
forwardheaders.WithForwardHeaders(cfg.ForwardHeaders),
}),
}

if cfg.Session.Filesystem.Path != "" {
Expand Down
4 changes: 3 additions & 1 deletion config/development.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ defaultNamespace: default
showTemporalSystemNamespace: false
feedbackUrl:
notifyOnNewVersion: true
disableWriteActions: false
auth:
enabled: false
providers:
Expand Down Expand Up @@ -41,4 +42,5 @@ codec:
session:
filesystem:
path: # .tmp
disableWriteActions: false
forwardHeaders: # can be used to pass additional HTTP headers from HTTP requests to Temporal gRPC backend
- X-Forwarded-For
8 changes: 7 additions & 1 deletion docker/config_template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ notifyOnNewVersion: {{ default .Env.TEMPORAL_NOTIFY_ON_NEW_VERSION "true" }}
refreshInterval: {{ default .Env.TEMPORAL_CONFIG_REFRESH_INTERVAL "0s" }}
showTemporalSystemNamespace:
{{ default .Env.TEMPORAL_SHOW_TEMPORAL_SYSTEM_NAMESPACE "false" }}
disableWriteActions: {{ default .Env.TEMPORAL_DISABLE_WRITE_ACTIONS "false" }}
cors:
allowOrigins:
# override framework's default that allows all origins "*"
Expand Down Expand Up @@ -43,4 +44,9 @@ session:
filesystem:
# if non-empty, switches to filesystem store instead of cookie store. Increases size limit from 4K to 64K
path: {{ default .Env.TEMPORAL_SESSION_STORE_PATH "" }}
disableWriteActions: {{ default .Env.TEMPORAL_DISABLE_WRITE_ACTIONS "false" }}
forwardHeaders: # comma separated list of headers to pass from HTTP API requests to Temporal gRPC backend
{{ if .Env.TEMPORAL_FORWARD_HEADERS }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What exactly is the expected env var here? An array of strings?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

added a comment

{{ range $seed := (split .Env.TEMPORAL_FORWARD_HEADERS ",") }}
- {{ . }}
{{ end }}
{{ end }}
50 changes: 50 additions & 0 deletions plugins/forwardheaders/forwardheaders.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
// The MIT License
//
// Copyright (c) 2022 Temporal Technologies Inc. All rights reserved.
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.

package forwardheaders

import (
"context"
"net/http"

"github.com/grpc-ecosystem/grpc-gateway/runtime"
"github.com/labstack/echo/v4"
"github.com/temporalio/ui-server/v2/server/api"
"google.golang.org/grpc/metadata"
)

func WithForwardHeaders(headers []string) api.Middleware {
return func(c echo.Context) runtime.ServeMuxOption {
return runtime.WithMetadata(
func(ctx context.Context, req *http.Request) metadata.MD {
md := metadata.MD{}
for _, header := range headers {
if x, ok := c.Request().Header[header]; ok {
md.Append(header, x...)
}
}

return md
},
)
}
}
4 changes: 3 additions & 1 deletion server/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,15 @@ type (
DefaultNamespace string `yaml:"defaultNamespace"`
FeedbackURL string `yaml:"feedbackUrl"`
NotifyOnNewVersion bool `yaml:"notifyOnNewVersion"`
// show temporal-system namespace in namespace selector
// Show temporal-system namespace in namespace selector
ShowTemporalSystemNamespace bool `yaml:"showTemporalSystemNamespace"`
// How often to reload the config
RefreshInterval time.Duration `yaml:"refreshInterval"`
Codec Codec `yaml:"codec"`
Session Session `yaml:"session"`
DisableWriteActions bool `yaml:"disableWriteActions"`
// Forward specified HTTP headers from HTTP API requests to Temporal gRPC backend
ForwardHeaders []string `yaml:"forwardHeaders"`
}

CORS struct {
Expand Down