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

Update routing #670

Merged
merged 4 commits into from
Jan 26, 2024
Merged

Update routing #670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dd8e52d
Update routing
CannonLock Jan 17, 2024
7512fc4
Clean path and Serve 404 file
CannonLock Jan 26, 2024
c9c07a7
Fix extra whitespace
haoming29 Jan 26, 2024
af80bf9
Reorder web asset redirect handler
haoming29 Jan 26, 2024
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
1 change: 0 additions & 1 deletion param/parameters_struct.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

68 changes: 47 additions & 21 deletions web_ui/ui.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import (
"net/http"
"os"
"os/signal"
"path"
"path/filepath"
"strings"
"syscall"
Expand Down Expand Up @@ -81,21 +82,39 @@ func getEnabledServers(ctx *gin.Context) {
}

func configureWebResource(engine *gin.Engine) error {
engine.GET("/view/*path", func(ctx *gin.Context) {
path := ctx.Param("path")
engine.GET("/view/*requestPath", func(ctx *gin.Context) {
requestPath := ctx.Param("requestPath")

if strings.HasSuffix(path, "/") {
path += "index.html"
// If the requestPath is a directory indicate that we are looking for the index.html file
if strings.HasSuffix(requestPath, "/") {
requestPath += "index.html"
}

// Clean the request path
requestPath = path.Clean(requestPath)

// If requestPath doesn't have extension, is not a directory, and has a index file, redirect to index file
if !strings.Contains(requestPath, ".") && !strings.HasSuffix(requestPath, "/") {
if _, err := webAssets.ReadFile("frontend/out" + requestPath + "/index.html"); err == nil {
ctx.Redirect(http.StatusMovedPermanently, "/view/"+requestPath+"/")
return
}
}

db := authDB.Load()
user, err := GetUser(ctx)

// If just one server is enabled, redirect to that server
if len(config.GetEnabledServerString(true)) == 1 && requestPath == "/index.html" {
ctx.Redirect(http.StatusFound, "/view/"+config.GetEnabledServerString(true)[0]+"/")
return
}

// If requesting servers other than the registry
if !strings.HasPrefix(path, "/registry") {
if !strings.HasPrefix(requestPath, "/registry") {

// Redirect initialized users from initialization pages
if strings.HasPrefix(path, "/initialization") && strings.HasSuffix(path, "index.html") {
if strings.HasPrefix(requestPath, "/initialization") && strings.HasSuffix(requestPath, "index.html") {

// If the user has been initialized previously
if db != nil {
Expand All @@ -105,7 +124,7 @@ func configureWebResource(engine *gin.Engine) error {
}

// Redirect authenticated users from login pages
if strings.HasPrefix(path, "/login") && strings.HasSuffix(path, "index.html") {
if strings.HasPrefix(requestPath, "/login") && strings.HasSuffix(requestPath, "index.html") {

// If the user has been authenticated previously
if err == nil && user != "" {
Expand All @@ -115,7 +134,7 @@ func configureWebResource(engine *gin.Engine) error {
}

// Direct uninitialized users to initialization pages
if !strings.HasPrefix(path, "/initialization") && strings.HasSuffix(path, "index.html") {
if !strings.HasPrefix(requestPath, "/initialization") && strings.HasSuffix(requestPath, "index.html") {

// If the user has not been initialized previously
if db == nil {
Expand All @@ -125,7 +144,7 @@ func configureWebResource(engine *gin.Engine) error {
}

// Direct unauthenticated initialized users to login pages
if !strings.HasPrefix(path, "/login") && strings.HasSuffix(path, "index.html") {
if !strings.HasPrefix(requestPath, "/login") && strings.HasSuffix(requestPath, "index.html") {

// If the user is not authenticated but initialized
if (err != nil || user == "") && db != nil {
Expand All @@ -135,19 +154,26 @@ func configureWebResource(engine *gin.Engine) error {
}
}

// If just one server is enabled, redirect to that server
if len(config.GetEnabledServerString(true)) == 1 && path == "/index.html" {
ctx.Redirect(http.StatusFound, "/view/"+config.GetEnabledServerString(true)[0]+"/index.html")
return
}

filePath := "frontend/out" + path
filePath := "frontend/out" + requestPath
file, _ := webAssets.ReadFile(filePath)
ctx.Data(
http.StatusOK,
mime.TypeByExtension(filePath),
file,
)

// If the file is not found, return 404
if file == nil {
notFoundFilePath := "frontend/out/404/index.html"
file, _ := webAssets.ReadFile(notFoundFilePath)
ctx.Data(
http.StatusOK,
mime.TypeByExtension(notFoundFilePath),
file,
)
} else {
// If the file is found, return the file
ctx.Data(
http.StatusOK,
mime.TypeByExtension(filePath),
file,
)
}
})

engine.GET("/api/v1.0/docs", func(ctx *gin.Context) {
Expand Down
Loading