mirror of
https://github.com/portainer/portainer.git
synced 2025-07-19 13:29:41 +02:00
* feat(stack): backport changes to CE EE-1189 * feat(stack): front end backport changes to CE EE-1199 (#5455) * feat(stack): front end backport changes to CE EE-1199 * fix k8s deploy logic * fixed web editor confirmation message typo. EE-1501 * fix(stack): fixed issue auth detail not remembered EE-1502 (#5459) * show status in buttons * removed onChangeRef function. * moved buttons in git form to its own component * removed unused variable. Co-authored-by: ArrisLee <arris_li@hotmail.com> * moved formvalue to kube app component * fix(stack): failed to pull and redeploy compose format k8s stack * fixed form value * fix(k8s): file content overridden when deployment failed with compose format EE-1548 * updated API response to get IsComposeFormat and show appropriate text. * feat(k8s): front end backport to CE * feat(kube): kube app auto update backend (#5547) * error message updates for different file type * not display creation source for external application * added confirmation modal to advanced app created by web editor * stop showing confirmation modal when updating application * disable rollback button when application type is not applicatiom form * only update file after deployment succeded * Revert "only update file after deployment succeded" This reverts commitb94bd2e96f
. * fix(k8s): file content overridden when deployment failed with compose format EE-1556 * added analytics-on directive to pull and redeploy button * fix(kube): don't valide resource control access for kube (#5568) * added missing question mark to k8s confirmation modal * fixed webhook format issue * added question marks to k8s app confirmation modal * added space in additional file list. * ignoring error on deletion * fix(k8s): Git authentication info not persisted * added RepositoryMechanismTypes constant * updated analytics functions * covert RepositoryMechanism to constant * fixed typo * removed unused function. * post tech review updates * fixed save settings n redeploy button * refact kub deploy logic * Revert "refact kub deploy logic" This reverts commitcbfdd58ece
. * feat(k8s): utilize user token for k8s auto update EE-1594 * feat(k8s): persist kub stack name EE-1630 * feat(k8s): support delete kub stack * fix(app): updated logic to delete stack for different kind apps. (#5648) * fix(app): updated logic to delete stack for different kind apps. * renamed variable * fix import * added StackName field. * fixed stack id not found issue. * fix(k8s): fixed qusetion mark alignment issue in PAT field. (#5611) * fix(k8s): fixed qusetion mark alignment issue in PAT field. * moved inline css to file. * fix(git-form: made auth input text full width * add ignore deleted arg * tech review updates * typo fix * fix(k8s): added console error when deleting k8s service. * fix(console): added no-console config * fix(deploy): added missing service. * fix: use stack editor as an owner when exists (#5678) * fix: tempalte/content based stacks edit/delete * fix(stack): remove stack when no app. (#5769) * fix(stack): remove stack when no app. * support compose format in delete Co-authored-by: ArrisLee <arris_li@hotmail.com> Co-authored-by: Hui <arris_li@hotmail.com> Co-authored-by: fhanportainer <79428273+fhanportainer@users.noreply.github.com> Co-authored-by: Felix Han <felix.han@portainer.io>
113 lines
3 KiB
Go
113 lines
3 KiB
Go
package factory
|
|
|
|
import (
|
|
"fmt"
|
|
"log"
|
|
"net"
|
|
"net/http"
|
|
"net/url"
|
|
"strings"
|
|
|
|
"github.com/pkg/errors"
|
|
portainer "github.com/portainer/portainer/api"
|
|
"github.com/portainer/portainer/api/crypto"
|
|
"github.com/portainer/portainer/api/http/proxy/factory/agent"
|
|
"github.com/portainer/portainer/api/internal/endpointutils"
|
|
)
|
|
|
|
// ProxyServer provide an extended proxy with a local server to forward requests
|
|
type ProxyServer struct {
|
|
server *http.Server
|
|
Port int
|
|
}
|
|
|
|
// NewAgentProxy creates a new instance of ProxyServer that wrap http requests with agent headers
|
|
func (factory *ProxyFactory) NewAgentProxy(endpoint *portainer.Endpoint) (*ProxyServer, error) {
|
|
urlString := endpoint.URL
|
|
|
|
if endpointutils.IsEdgeEndpoint((endpoint)) {
|
|
tunnel, err := factory.reverseTunnelService.GetActiveTunnel(endpoint)
|
|
if err != nil {
|
|
return nil, errors.Wrap(err, "failed starting tunnel")
|
|
}
|
|
|
|
urlString = fmt.Sprintf("http://127.0.0.1:%d", tunnel.Port)
|
|
}
|
|
|
|
endpointURL, err := parseURL(urlString)
|
|
if err != nil {
|
|
return nil, errors.Wrapf(err, "failed parsing url %s", endpoint.URL)
|
|
}
|
|
|
|
endpointURL.Scheme = "http"
|
|
httpTransport := &http.Transport{}
|
|
|
|
if endpoint.TLSConfig.TLS || endpoint.TLSConfig.TLSSkipVerify {
|
|
config, err := crypto.CreateTLSConfigurationFromDisk(endpoint.TLSConfig.TLSCACertPath, endpoint.TLSConfig.TLSCertPath, endpoint.TLSConfig.TLSKeyPath, endpoint.TLSConfig.TLSSkipVerify)
|
|
if err != nil {
|
|
return nil, errors.WithMessage(err, "failed generating tls configuration")
|
|
}
|
|
|
|
httpTransport.TLSClientConfig = config
|
|
endpointURL.Scheme = "https"
|
|
}
|
|
|
|
proxy := newSingleHostReverseProxyWithHostHeader(endpointURL)
|
|
|
|
proxy.Transport = agent.NewTransport(factory.signatureService, httpTransport)
|
|
|
|
proxyServer := &ProxyServer{
|
|
server: &http.Server{
|
|
Handler: proxy,
|
|
},
|
|
Port: 0,
|
|
}
|
|
|
|
err = proxyServer.start()
|
|
if err != nil {
|
|
return nil, errors.Wrap(err, "failed starting proxy server")
|
|
}
|
|
|
|
return proxyServer, nil
|
|
}
|
|
|
|
func (proxy *ProxyServer) start() error {
|
|
listener, err := net.Listen("tcp", ":0")
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
proxy.Port = listener.Addr().(*net.TCPAddr).Port
|
|
go func() {
|
|
proxyHost := fmt.Sprintf("127.0.0.1:%d", proxy.Port)
|
|
log.Printf("Starting Proxy server on %s...\n", proxyHost)
|
|
|
|
err := proxy.server.Serve(listener)
|
|
log.Printf("Exiting Proxy server %s\n", proxyHost)
|
|
|
|
if err != nil && err != http.ErrServerClosed {
|
|
log.Printf("Proxy server %s exited with an error: %s\n", proxyHost, err)
|
|
}
|
|
}()
|
|
|
|
return nil
|
|
}
|
|
|
|
// Close shuts down the server
|
|
func (proxy *ProxyServer) Close() {
|
|
if proxy.server != nil {
|
|
proxy.server.Close()
|
|
}
|
|
}
|
|
|
|
// parseURL parses the endpointURL using url.Parse.
|
|
//
|
|
// to prevent an error when url has port but no protocol prefix
|
|
// we add `//` prefix if needed
|
|
func parseURL(endpointURL string) (*url.URL, error) {
|
|
if !strings.HasPrefix(endpointURL, "http") && !strings.HasPrefix(endpointURL, "tcp") && !strings.HasPrefix(endpointURL, "//") {
|
|
endpointURL = fmt.Sprintf("//%s", endpointURL)
|
|
}
|
|
|
|
return url.Parse(endpointURL)
|
|
}
|