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

[Feat] Golang http proxy #2819

Merged
merged 1 commit into from
Nov 22, 2024
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
3 changes: 0 additions & 3 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,6 @@ jobs:
id: set-architectures
run: |
ARCHITECTURES=${{ needs.configure.outputs.architectures }}
if [ "${{ matrix.component }}" == "proxy" ]; then
ARCHITECTURES=$(echo ${ARCHITECTURES} | sed 's/,linux\/arm\/v7//')
fi
echo "ARCHITECTURES=${ARCHITECTURES}" >> $GITHUB_ENV
- name: Set up QEMU
uses: docker/setup-qemu-action@v3.2.0
Expand Down
1 change: 0 additions & 1 deletion build/proxy/Dockerfile

This file was deleted.

16 changes: 16 additions & 0 deletions cmd/proxy/doc.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// Copyright 2019-2024 The Liqo Authors
//
// 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.

// Package proxy contains the logic for the Liqo proxy.
package main
42 changes: 42 additions & 0 deletions cmd/proxy/main.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
// Copyright 2019-2024 The Liqo Authors
//
// 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.

package main

import (
"context"
"flag"
"os"

"k8s.io/klog/v2"

"github.com/liqotech/liqo/pkg/proxy"
)

func main() {
ctx := context.Background()

port := flag.Int("port", 8080, "port to listen on")
allowedHosts := flag.String("allowed-hosts", "", "comma separated list of allowed hosts")
forceHost := flag.String("force-host", "", "force the server Host to this value")

flag.Parse()

p := proxy.New(*allowedHosts, *port, *forceHost)

if err := p.Start(ctx); err != nil {
klog.Error(err)
os.Exit(1)
}
}
80 changes: 0 additions & 80 deletions deployments/liqo/templates/liqo-proxy-configmap.yaml

This file was deleted.

12 changes: 3 additions & 9 deletions deployments/liqo/templates/liqo-proxy-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,23 +36,17 @@ spec:
ports:
- containerPort: {{ .Values.proxy.config.listeningPort }}
resources: {{- toYaml .Values.proxy.pod.resources | nindent 12 }}
volumeMounts:
- mountPath: /etc/envoy/envoy.yaml
name: config-volume
subPath: config
{{- if or .Values.common.extraArgs .Values.proxy.pod.extraArgs }}
args:
- --port={{ .Values.proxy.config.listeningPort }}
- --force-host=kubernetes.default.svc:443
{{- if or .Values.common.extraArgs .Values.proxy.pod.extraArgs }}
{{- if .Values.common.extraArgs }}
{{- toYaml .Values.common.extraArgs | nindent 10 }}
{{- end }}
{{- if .Values.proxy.pod.extraArgs }}
{{- toYaml .Values.proxy.pod.extraArgs | nindent 10 }}
{{- end }}
{{- end }}
volumes:
- name: config-volume
configMap:
name: {{ include "liqo.prefixedName" $proxyConfig }}
{{- if ((.Values.common).nodeSelector) }}
nodeSelector:
{{- toYaml .Values.common.nodeSelector | nindent 8 }}
Expand Down
2 changes: 1 addition & 1 deletion docs/advanced/k8s-api-server-proxy.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ This feature is **internally** used by the [in-band peering](UsagePeeringInBand)
If you just need to peer two clusters without publicly exposing the Kubernetes API server, you can use the [in-band peering](UsagePeeringInBand).
```

The Kubernetes API Server Proxy is an Envoy HTTP server that accepts [HTTP Connect](https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/CONNECT) requests and forwards them to the Kubernetes API Server of the local cluster.
The Kubernetes API Server Proxy is an HTTP server that accepts [HTTP Connect](https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods/CONNECT) requests and forwards them to the Kubernetes API Server of the local cluster.
It just proxy the requests to the API server and it has no permission on the local cluster.
This means that, as usual, all the requesters must authenticate with the Kubernetes API Server to access the resources.

Expand Down
112 changes: 112 additions & 0 deletions pkg/proxy/connect.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
// Copyright 2019-2024 The Liqo Authors
//
// 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.

package proxy

import (
"bufio"
"io"
"net"
"net/http"
"time"

"k8s.io/klog/v2"
)

func (p *Proxy) handleConnect(c net.Conn) {
br := bufio.NewReader(c)
req, err := http.ReadRequest(br)
if err != nil {
klog.Errorf("error reading request: %v", err)
return
}

if req.Method != http.MethodConnect {
response := &http.Response{
StatusCode: http.StatusMethodNotAllowed,
ProtoMajor: 1,
ProtoMinor: 1,
}
if err := response.Write(c); err != nil {
klog.Errorf("error writing response: %v", err)
}
if err := c.Close(); err != nil {
klog.Errorf("error closing connection: %v", err)
}
return
}

if p.ForceHost == "" && !p.isAllowed(req.URL.Host) {
klog.Infof("host %s is not allowed", req.URL.Host)

response := &http.Response{
StatusCode: http.StatusForbidden,
ProtoMajor: 1,
ProtoMinor: 1,
}
if err := response.Write(c); err != nil {
klog.Errorf("error writing response: %v", err)
}
return
}

klog.Infof("handling CONNECT to %s", req.URL.Host)

response := &http.Response{
StatusCode: 200,
ProtoMajor: 1,
ProtoMinor: 1,
}
if err := response.Write(c); err != nil {
klog.Errorf("error writing response: %v", err)
if err := c.Close(); err != nil {
klog.Errorf("error closing connection: %v", err)
}
return
}

destConn, err := net.DialTimeout("tcp", p.getHost(req), 30*time.Second)
if err != nil {
klog.Errorf("error dialing destination: %v", err)

response := &http.Response{
StatusCode: http.StatusRequestTimeout,
ProtoMajor: 1,
ProtoMinor: 1,
}
if err := response.Write(c); err != nil {
klog.Errorf("error writing response: %v", err)
}
return
}

go transfer(destConn, c)
go transfer(c, destConn)
}

func (p *Proxy) getHost(req *http.Request) string {
if p.ForceHost != "" {
return p.ForceHost
}
return req.URL.Host
}

func transfer(destination io.WriteCloser, source io.ReadCloser) {
defer destination.Close()
defer source.Close()
aleoli marked this conversation as resolved.
Show resolved Hide resolved
_, err := io.Copy(destination, source)
if err != nil {
klog.Errorf("error copying data: %v", err)
}
}
16 changes: 16 additions & 0 deletions pkg/proxy/doc.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// Copyright 2019-2024 The Liqo Authors
//
// 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.

// Package proxy contains the logic for the Liqo proxy.
package proxy
Loading