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.

Sign up for GitHub

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

fix(system): Fix Cloudflare Proxy Access Issue with 1Panel When Secur… #7458

Merged
merged 1 commit into from
Dec 20, 2024
Merged

fix(system): Fix Cloudflare Proxy Access Issue with 1Panel When Secur… #7458

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions backend/init/router/router.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ var (
)

func toIndexHtml(c *gin.Context) {
c.Writer.Header().Set("Content-Type", "text/html; charset=utf-8")
c.Writer.WriteHeader(http.StatusOK)
_, _ = c.Writer.Write(web.IndexByte)
c.Writer.Header().Add("Accept", "text/html")
c.Writer.Flush()
}

Expand Down Expand Up @@ -131,9 +131,9 @@ func setWebStatic(rootRouter *gin.RouterGroup) {
handleNoRoute(c)
return
}
c.Writer.Header().Set("Content-Type", "text/html; charset=utf-8")
c.Writer.WriteHeader(http.StatusOK)
_, _ = c.Writer.Write(web.IndexByte)
c.Writer.Header().Add("Accept", "text/html")
c.Writer.Flush()
})
}
Copy link
Member

Choose a reason for hiding this comment

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

The given code appears to be part of a Gin web application. It defines two functions: toIndexHtml and setWebStatic. Here's a brief analysis:

Code Differences and Potential Issues:

File 1: main.go (or similar)

package main

import (
    "github.com/gin-gonic/gin"
    ...
)

func main() {
    router := gin.Default()

    // Set up static files routes
    setWebStatic(router)

    // Define other routes
    setupRoutes(router)

    // Start the server
    if err := router.Run(":8080"); err != nil {
        panic(err)
    }
}

// Function definitions...

File 2: utils/web/handlers.go

var (

	IndexByte []byte = []byte("<html><body>Hello, World!</body></html>")
)

func toIndexHtml(c *gin.Context) {
	c.Writer.Header().Set("Content-Type", "text/html; charset=utf-8") // Added content type header
	c.Writer.WriteHeader(http.StatusOK)
	_, _ = c.Writer.Write(IndexByte)
	c.Writer.Flush()
}

func setWebStatic(rootRouter *gin.RouterGroup) {
	rootRouter.Use(func(c *gin.Context) { // Middleware to add headers
		if !c.Request.MethodAllowed() || len(c.Request.URL.Path) == 0 {
			c.JSON(405, gin.H{"error": "Method Not Allowed"})
			return
		}
		c.Set("requestPath", c.Request.URL.Path)
		c.Next()
	})
	rootRouter.Any("*/*", func(c *gin.Context) {
		parts := c.Request.URL.Path.split("/") // Assuming Path is a string function for splitting paths
		if len(parts) <= 1 {
			toIndexHtml(c) // Serve index page when no specific route matches
		} else {
			staticDir := "./www" // Adjust this path as needed
			file, err := ioutil.ReadFile(path.Join(staticDir, strings.Join(parts[1:], "/")))
			if err != nil {
				http.Error(c.Writer, err.Error(), http.StatusInternalServerError) // Handle file not found error
			 return
			}
			contentType := mime.TypeByExtension(filepath.Ext(file.Name()))
			c.Data(http.StatusOK, contentType, file)
			return
		}
	})

    // Additional middleware and routing logic can go here...
}

// Helper functions...

Optimizations and Suggestions:

  1. Remove Redundant Content Type Header: The line c.Writer.Header().Add("Accept", "text/html") can be removed since it doesn't serve any additional purpose except adding an unnecessary key-value pair.

  2. Middleware Implementation:

    • Use Gin middleware to centralize common request handling tasks like setting status codes and logging.
    • Consider using context variables instead of querying parameters within handler functions, especially in performance-critical parts of your app.

  3. Error Handling:

    • When reading from the filesystem (ioutil.ReadFile) and serving data over HTTP, ensure you handle errors appropriately and log them for debugging purposes.

  4. Performance Improvements:

    • If dealing with multiple requests per second, consider parallelizing file reads if applicable.
    • Pre-compute some constants or values that do not change during runtime.

Overall, the code looks well-structured and should work correctly for its intended purpose as long as all referenced packages are properly imported.

Expand Down
Loading