Skip to content

Commit c55f66a

Browse files
Cleanup credentials server implementation
1 parent d3fb6e9 commit c55f66a

File tree

1 file changed

+0
-58
lines changed

1 file changed

+0
-58
lines changed

pkg/credentials/server.go

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package credentials
22

33
import (
4-
"bytes"
54
"cmp"
65
"context"
76
"fmt"
@@ -13,10 +12,7 @@ import (
1312
"strconv"
1413

1514
"github.com/loft-sh/devpod/pkg/agent/tunnel"
16-
locald "github.com/loft-sh/devpod/pkg/daemon/local"
17-
network "github.com/loft-sh/devpod/pkg/daemon/workspace/network"
1815
devpodlog "github.com/loft-sh/devpod/pkg/log"
19-
"github.com/loft-sh/devpod/pkg/ts"
2016
"github.com/loft-sh/log"
2117
"github.com/pkg/errors"
2218
"github.com/sirupsen/logrus"
@@ -127,9 +123,6 @@ func handleDockerCredentialsRequest(ctx context.Context, writer http.ResponseWri
127123
}
128124

129125
func handleGitCredentialsRequest(ctx context.Context, writer http.ResponseWriter, request *http.Request, client tunnel.TunnelClient, clientHost string, log log.Logger) error {
130-
if clientHost != "" {
131-
return handleGitCredentialsOverTSNet(ctx, writer, request, clientHost, log)
132-
}
133126
out, err := io.ReadAll(request.Body)
134127
if err != nil {
135128
return errors.Wrap(err, "read request body")
@@ -149,57 +142,6 @@ func handleGitCredentialsRequest(ctx context.Context, writer http.ResponseWriter
149142
return nil
150143
}
151144

152-
func handleGitCredentialsOverTSNet(ctx context.Context, writer http.ResponseWriter, request *http.Request, clientHost string, log log.Logger) error {
153-
bodyBytes, err := io.ReadAll(request.Body)
154-
if err != nil {
155-
return errors.Wrap(err, "read request body")
156-
}
157-
defer request.Body.Close()
158-
159-
log.Infof("Received git credentials post data: %s", string(bodyBytes))
160-
161-
// Create a DevPod network client to local credentials server
162-
client := network.GetHTTPClient()
163-
credServerAddress := ts.EnsureURL(clientHost, locald.LocalCredentialsServerPort)
164-
targetURL := fmt.Sprintf("http://%s%s", credServerAddress, request.URL.RequestURI())
165-
166-
// Recreate the request to new targetURL.
167-
newReq, err := http.NewRequest(request.Method, targetURL, bytes.NewReader(bodyBytes))
168-
if err != nil {
169-
log.Errorf("Failed to create new request: %v", err)
170-
return errors.Wrap(err, "create request")
171-
}
172-
newReq.Header = request.Header.Clone()
173-
174-
log.Infof("Forwarding request to %s", targetURL)
175-
176-
// Execute the request.
177-
resp, err := client.Do(newReq)
178-
if err != nil {
179-
log.Fatalf("HTTP request error: %v", err)
180-
return errors.Wrap(err, "HTTP request error")
181-
}
182-
defer resp.Body.Close()
183-
184-
// Read the response from the forwarded request.
185-
respBody, err := io.ReadAll(resp.Body)
186-
if err != nil {
187-
log.Fatalf("Error reading response: %v", err)
188-
return errors.Wrap(err, "read response")
189-
}
190-
log.Infof("Response: %s", string(respBody))
191-
192-
// Write the response back to the original response.
193-
writer.Header().Set("Content-Type", "application/json")
194-
writer.WriteHeader(http.StatusOK)
195-
if _, err := writer.Write(respBody); err != nil {
196-
log.Errorf("Error writing response to client: %v", err)
197-
return errors.Wrap(err, "write response")
198-
}
199-
200-
return nil
201-
}
202-
203145
func handleGitSSHSignatureRequest(ctx context.Context, writer http.ResponseWriter, request *http.Request, client tunnel.TunnelClient, log log.Logger) error {
204146
out, err := io.ReadAll(request.Body)
205147
if err != nil {

0 commit comments

Comments
 (0)