changes default ports

Author: prajjwaldimri

.vscode/tasks.json

@@ -16,9 +16,9 @@
         "--accept-multiclient",
         "--",
         "--debug=true",
-        "--derp-port=50052",
-        "--asur-port=50053",
-        "--oginy-port=50051"
+        "--derp-port=59992",
+        "--asur-port=59993",
+        "--oginy-port=59991"
       ],
       "isBackground": true,
       "problemMatcher": {
@@ -65,7 +65,7 @@
     {
       "label": "Build and Run with Sudo",
       "type": "shell",
-      "command": "go build -o transparent-cache-test test.go && sudo ./transparent-cache-test --debug=true --derp-port=50052 --asur-port=50053 --oginy-port=50051",
+      "command": "go build -o transparent-cache-test test.go && sudo ./transparent-cache-test --debug=true --derp-port=59992 --asur-port=59993 --oginy-port=59991",
       "group": {
         "kind": "build",
         "isDefault": true

pkg/app/app.go

@@ -93,14 +93,14 @@ type TransparentCacheSettings struct {
 }
 
 func (t *TransparentCacheSettings) ApplyDefaults() {
-	if t.DerpPort == 0 {
-		t.DerpPort = 50052
-	}
 	if t.OginyPort == 0 {
-		t.OginyPort = 50051
+		t.OginyPort = 59991
+	}
+	if t.DerpPort == 0 {
+		t.DerpPort = 59992
 	}
 	if t.AsurPort == 0 {
-		t.AsurPort = 50053
+		t.AsurPort = 59993
 	}
 }
 

pkg/transparent-cache/derp/client/client_twirp/main.go

@@ -109,7 +109,7 @@ func (c *TwirpClient) FinalizeCacheEntryUpload(ctx context.Context, req *cachepb
 
 func main() {
 	// Create Twirp client
-	client := NewTwirpClient("http://localhost:50051")
+	client := NewTwirpClient("http://localhost:59991")
 
 	// Create context
 	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)

pkg/transparent-cache/derp/client/main.go

@@ -17,7 +17,7 @@ func main() {
 	}
 
 	// Create Twirp client using the generated client
-	client := cachepb.NewCacheServiceJSONClient("http://localhost:50051", httpClient)
+	client := cachepb.NewCacheServiceJSONClient("http://localhost:59991", httpClient)
 
 	// Create context
 	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)

pkg/transparent-cache/oginy/oginy.go

@@ -456,6 +456,10 @@ func Start(port int, loggingEnabled bool) error {
 	}
 	log.Printf("Using certificate directory: %s", certDir)
 
+	// Cleanup any existing certificates
+	os.RemoveAll(filepath.Join(certDir, "*.crt"))
+	os.RemoveAll(filepath.Join(certDir, "*.key"))
+
 	// Generate CA if it doesn't exist
 	caCertPath := filepath.Join(certDir, "localCA.crt")
 	caKeyPath := filepath.Join(certDir, "localCA.key")

test.go

@@ -15,9 +15,9 @@ import (
 func main() {
 	// Define command line flags
 	var (
-		derpPort       = flag.Int("derp-port", 50052, "Port for DERP (Cache Twirp) service")
-		asurPort       = flag.Int("asur-port", 50053, "Port for ASUR (Azure→S3 Proxy) service")
-		oginyPort      = flag.Int("oginy-port", 50051, "Port for OGINY (TLS Reverse Proxy) service. Set to 0 to disable")
+		derpPort       = flag.Int("derp-port", 59992, "Port for DERP (Cache Twirp) service")
+		asurPort       = flag.Int("asur-port", 59993, "Port for ASUR (Azure→S3 Proxy) service")
+		oginyPort      = flag.Int("oginy-port", 59991, "Port for OGINY (TLS Reverse Proxy) service. Set to 0 to disable")
 		backendURL     = flag.String("backend-url", "http://localhost:8000", "WarpCache backend URL")
 		authToken      = flag.String("auth-token", "", "WarpCache authentication token")
 		debug          = flag.Bool("debug", true, "Enable debug mode")