From 14326ba9be276d2649b4681d3ebed1c32f65013f Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Thu, 13 Feb 2025 01:28:35 +0800 Subject: [PATCH] _header.html: Add header --- http_auth.go | 16 ++++++++++++++++ http_handle_group_index.go | 9 +++------ http_handle_index.go | 9 +++------ http_handle_repo_commit.go | 19 ++++++++----------- http_handle_repo_index.go | 19 ++++++++----------- http_handle_repo_info.go | 4 ++-- http_handle_repo_log.go | 11 ++++------- http_handle_repo_raw.go | 14 ++++++-------- http_handle_repo_tree.go | 20 +++++++++----------- http_server.go | 31 ++++++++++++++++++++++--------- schema.sql | 6 ++++++ templates/_header.html.tmpl | 12 ++++++++++++ templates/_repo_header.html.tmpl | 1 - templates/group_repos.html.tmpl | 3 +++ templates/index.html.tmpl | 3 +++ templates/repo_commit.html.tmpl | 3 +++ templates/repo_index.html.tmpl | 3 +++ templates/repo_log.html.tmpl | 3 +++ templates/repo_raw_dir.html.tmpl | 3 +++ templates/repo_tree_dir.html.tmpl | 3 +++ templates/repo_tree_file.html.tmpl | 3 +++ diff --git a/http_auth.go b/http_auth.go new file mode 100644 index 0000000000000000000000000000000000000000..370e38b45efa8fd74ab43d8f824654e71d35747d --- /dev/null +++ b/http_auth.go @@ -0,0 +1,16 @@ +package main + +import ( + "net/http" +) + +func get_user_info_from_request(r *http.Request) (id int, username string, err error) { + session_cookie, err := r.Cookie("session") + if err != nil { + return + } + + err = database.QueryRow(r.Context(), "SELECT user_id, username FROM users u JOIN sessions s ON u.id = s.user_id WHERE s.session_id = $1;", session_cookie.Value).Scan(&id, &username) + + return +} diff --git a/http_handle_group_index.go b/http_handle_group_index.go index 2a8e1cad25f4a44c5b16bdbcd74ab9c7db25d582..d342277dc4ec69f0aae9bd7b1d57f4f70d99f9d4 100644 --- a/http_handle_group_index.go +++ b/http_handle_group_index.go @@ -4,11 +4,8 @@ import ( "net/http" ) -func handle_group_repos(w http.ResponseWriter, r *http.Request, params map[string]string) { - data := make(map[string]any) - data["global"] = global_data +func handle_group_repos(w http.ResponseWriter, r *http.Request, params map[string]any) { group_name := params["group_name"] - data["group_name"] = group_name var names []string rows, err := database.Query(r.Context(), "SELECT r.name FROM repos r JOIN groups g ON r.group_id = g.id WHERE g.name = $1;", group_name) @@ -32,9 +29,9 @@ _, _ = w.Write([]byte("Error iterating over rows: " + err.Error())) return } - data["repos"] = names + params["repos"] = names - err = templates.ExecuteTemplate(w, "group_repos", data) + err = templates.ExecuteTemplate(w, "group_repos", params) if err != nil { _, _ = w.Write([]byte("Error rendering template: " + err.Error())) return diff --git a/http_handle_index.go b/http_handle_index.go index bf36f98865039d4647601b9e7b3e1145fbb036f4..44482729ffa96aacb6f8f6982d231d399870728f 100644 --- a/http_handle_index.go +++ b/http_handle_index.go @@ -4,10 +4,7 @@ import ( "net/http" ) -func handle_index(w http.ResponseWriter, r *http.Request) { - data := make(map[string]any) - data["global"] = global_data - +func handle_index(w http.ResponseWriter, r *http.Request, params map[string]any) { rows, err := database.Query(r.Context(), "SELECT name FROM groups") if err != nil { _, _ = w.Write([]byte("Error querying groups: " + err.Error())) @@ -30,9 +27,9 @@ _, _ = w.Write([]byte("Error iterating over rows: " + err.Error())) return } - data["groups"] = groups + params["groups"] = groups - err = templates.ExecuteTemplate(w, "index", data) + err = templates.ExecuteTemplate(w, "index", params) if err != nil { _, _ = w.Write([]byte("Error rendering template: " + err.Error())) return diff --git a/http_handle_repo_commit.go b/http_handle_repo_commit.go index d79b088a9c945a8e17fa7ceafe2e9f36699d5156..073bfa11d76669bd6d0603661968a41ab1c758e9 100644 --- a/http_handle_repo_commit.go +++ b/http_handle_repo_commit.go @@ -16,11 +16,8 @@ To diff.File Chunks []diff.Chunk } -func handle_repo_commit(w http.ResponseWriter, r *http.Request, params map[string]string) { - data := make(map[string]any) - data["global"] = global_data - group_name, repo_name, commit_id_specified_string := params["group_name"], params["repo_name"], params["commit_id"] - data["group_name"], data["repo_name"] = group_name, repo_name +func handle_repo_commit(w http.ResponseWriter, r *http.Request, params map[string]any) { + group_name, repo_name, commit_id_specified_string := params["group_name"].(string), params["repo_name"].(string), params["commit_id"].(string) repo, err := open_git_repo(r.Context(), group_name, repo_name) if err != nil { _, _ = w.Write([]byte("Error opening repo: " + err.Error())) @@ -49,16 +46,16 @@ http.Redirect(w, r, commit_id_string, http.StatusSeeOther) return } - data["commit_object"] = commit_object - data["commit_id"] = commit_id_string + params["commit_object"] = commit_object + params["commit_id"] = commit_id_string parent_commit_hash, patch, err := get_patch_from_commit(commit_object) if err != nil { _, _ = w.Write([]byte("Error getting patch from commit: " + err.Error())) return } - data["parent_commit_hash"] = parent_commit_hash.String() - data["patch"] = patch + params["parent_commit_hash"] = parent_commit_hash.String() + params["patch"] = patch // TODO: Remove unnecessary context // TODO: Prepend "+"/"-"/" " instead of solely distinguishing based on color @@ -78,9 +75,9 @@ To: to, } usable_file_patches = append(usable_file_patches, usable_file_patch) } - data["file_patches"] = usable_file_patches + params["file_patches"] = usable_file_patches - err = templates.ExecuteTemplate(w, "repo_commit", data) + err = templates.ExecuteTemplate(w, "repo_commit", params) if err != nil { _, _ = w.Write([]byte("Error rendering template: " + err.Error())) return diff --git a/http_handle_repo_index.go b/http_handle_repo_index.go index 0c7b5702444d80473dafc7c6e39bb119241ef1ee..866463d09d41aa0c8030b4ef32666655fbfc06e2 100644 --- a/http_handle_repo_index.go +++ b/http_handle_repo_index.go @@ -5,11 +5,8 @@ "net/http" "net/url" ) -func handle_repo_index(w http.ResponseWriter, r *http.Request, params map[string]string) { - data := make(map[string]any) - data["global"] = global_data - group_name, repo_name := params["group_name"], params["repo_name"] - data["group_name"], data["repo_name"] = group_name, repo_name +func handle_repo_index(w http.ResponseWriter, r *http.Request, params map[string]any) { + group_name, repo_name := params["group_name"].(string), params["repo_name"].(string) repo, err := open_git_repo(r.Context(), group_name, repo_name) if err != nil { _, _ = w.Write([]byte("Error opening repo: " + err.Error())) @@ -20,14 +17,14 @@ if err != nil { _, _ = w.Write([]byte("Error getting repo HEAD: " + err.Error())) return } - data["ref"] = head.Name().Short() + params["ref"] = head.Name().Short() head_hash := head.Hash() recent_commits, err := get_recent_commits(repo, head_hash, 3) if err != nil { _, _ = w.Write([]byte("Error getting recent commits: " + err.Error())) return } - data["commits"] = recent_commits + params["commits"] = recent_commits commit_object, err := repo.CommitObject(head_hash) if err != nil { _, _ = w.Write([]byte("Error getting commit object: " + err.Error())) @@ -39,12 +36,12 @@ _, _ = w.Write([]byte("Error getting file tree: " + err.Error())) return } - data["readme_filename"], data["readme"] = render_readme_at_tree(tree) - data["files"] = build_display_git_tree(tree) + params["readme_filename"], params["readme"] = render_readme_at_tree(tree) + params["files"] = build_display_git_tree(tree) - data["clone_url"] = "ssh://" + r.Host + "/" + url.PathEscape(params["group_name"]) + "/:/repos/" + url.PathEscape(params["repo_name"]) + params["clone_url"] = "ssh://" + r.Host + "/" + url.PathEscape(group_name) + "/:/repos/" + url.PathEscape(repo_name) - err = templates.ExecuteTemplate(w, "repo_index", data) + err = templates.ExecuteTemplate(w, "repo_index", params) if err != nil { _, _ = w.Write([]byte("Error rendering template: " + err.Error())) return diff --git a/http_handle_repo_info.go b/http_handle_repo_info.go index 5dd92e97a93906c06ae6da3ed0548e754b51f51a..e220f18e375b0e895a393665090c64773e877a13 100644 --- a/http_handle_repo_info.go +++ b/http_handle_repo_info.go @@ -5,6 +5,6 @@ "net/http" "net/url" ) -func handle_repo_info(w http.ResponseWriter, r *http.Request, params map[string]string) { - http.Error(w, "\x1b[1;93mHi! We do not support Git operations over HTTP yet.\x1b[0m\n\x1b[1;93mMeanwhile, please use ssh by simply replacing the scheme with \"ssh://\":\x1b[0m\n\x1b[1;93mssh://"+r.Host+"/"+url.PathEscape(params["group_name"])+"/:/repos/"+url.PathEscape(params["repo_name"])+"\x1b[0m", http.StatusNotImplemented) +func handle_repo_info(w http.ResponseWriter, r *http.Request, params map[string]any) { + http.Error(w, "\x1b[1;93mHi! We do not support Git operations over HTTP yet.\x1b[0m\n\x1b[1;93mMeanwhile, please use ssh by simply replacing the scheme with \"ssh://\":\x1b[0m\n\x1b[1;93mssh://"+r.Host+"/"+url.PathEscape(params["group_name"].(string))+"/:/repos/"+url.PathEscape(params["repo_name"].(string))+"\x1b[0m", http.StatusNotImplemented) } diff --git a/http_handle_repo_log.go b/http_handle_repo_log.go index 6a3f44600cc3d7b26c19ef2c729514890840762d..f36fba29a25cdbac5cc370065c005d4c251a64b4 100644 --- a/http_handle_repo_log.go +++ b/http_handle_repo_log.go @@ -7,11 +7,8 @@ "github.com/go-git/go-git/v5/plumbing" ) // TODO: I probably shouldn't include *all* commits here... -func handle_repo_log(w http.ResponseWriter, r *http.Request, params map[string]string) { - data := make(map[string]any) - data["global"] = global_data - group_name, repo_name, ref_name := params["group_name"], params["repo_name"], params["ref"] - data["group_name"], data["repo_name"], data["ref"] = group_name, repo_name, ref_name +func handle_repo_log(w http.ResponseWriter, r *http.Request, params map[string]any) { + group_name, repo_name, ref_name := params["group_name"].(string), params["repo_name"].(string), params["ref"].(string) repo, err := open_git_repo(r.Context(), group_name, repo_name) if err != nil { _, _ = w.Write([]byte("Error opening repo: " + err.Error())) @@ -28,9 +25,9 @@ if err != nil { _, _ = w.Write([]byte("Error getting recent commits: " + err.Error())) return } - data["commits"] = commits + params["commits"] = commits - err = templates.ExecuteTemplate(w, "repo_log", data) + err = templates.ExecuteTemplate(w, "repo_log", params) if err != nil { _, _ = w.Write([]byte("Error rendering template: " + err.Error())) return diff --git a/http_handle_repo_raw.go b/http_handle_repo_raw.go index 24b579414b23c97a0ad1de73e381815891a761e8..e647e320368a29b882c238d3fe720b5ba9e5479e 100644 --- a/http_handle_repo_raw.go +++ b/http_handle_repo_raw.go @@ -9,11 +9,9 @@ "github.com/go-git/go-git/v5/plumbing/object" ) -func handle_repo_raw(w http.ResponseWriter, r *http.Request, params map[string]string) { - data := make(map[string]any) - data["global"] = global_data - raw_path_spec := params["rest"] - group_name, repo_name, path_spec := params["group_name"], params["repo_name"], strings.TrimSuffix(raw_path_spec, "/") +func handle_repo_raw(w http.ResponseWriter, r *http.Request, params map[string]any) { + raw_path_spec := params["rest"].(string) + group_name, repo_name, path_spec := params["group_name"].(string), params["repo_name"].(string), strings.TrimSuffix(raw_path_spec, "/") ref_type, ref_name, err := get_param_ref_and_type(r) if err != nil { @@ -25,7 +23,7 @@ return } } - data["ref_type"], data["ref"], data["group_name"], data["repo_name"], data["path_spec"] = ref_type, ref_name, group_name, repo_name, path_spec + params["ref_type"], params["ref"], params["path_spec"] = ref_type, ref_name, path_spec repo, err := open_git_repo(r.Context(), group_name, repo_name) if err != nil { @@ -80,9 +78,9 @@ http.Redirect(w, r, path.Base(path_spec)+"/", http.StatusSeeOther) return } - data["files"] = build_display_git_tree(target) + params["files"] = build_display_git_tree(target) - err = templates.ExecuteTemplate(w, "repo_raw_dir", data) + err = templates.ExecuteTemplate(w, "repo_raw_dir", params) if err != nil { _, _ = w.Write([]byte("Error rendering template: " + err.Error())) return diff --git a/http_handle_repo_tree.go b/http_handle_repo_tree.go index 1dc06a83a628b6d3539969e3e73fbabf05c1b4d2..0132239f806da6b4a4fbe57ca81a6b79c9b8c3ec 100644 --- a/http_handle_repo_tree.go +++ b/http_handle_repo_tree.go @@ -14,11 +14,9 @@ chroma_styles "github.com/alecthomas/chroma/v2/styles" "github.com/go-git/go-git/v5/plumbing/object" ) -func handle_repo_tree(w http.ResponseWriter, r *http.Request, params map[string]string) { - data := make(map[string]any) - data["global"] = global_data - raw_path_spec := params["rest"] - group_name, repo_name, path_spec := params["group_name"], params["repo_name"], strings.TrimSuffix(raw_path_spec, "/") +func handle_repo_tree(w http.ResponseWriter, r *http.Request, params map[string]any) { + raw_path_spec := params["rest"].(string) + group_name, repo_name, path_spec := params["group_name"].(string), params["repo_name"].(string), strings.TrimSuffix(raw_path_spec, "/") ref_type, ref_name, err := get_param_ref_and_type(r) if err != nil { if errors.Is(err, err_no_ref_spec) { @@ -28,7 +26,7 @@ _, _ = w.Write([]byte("Error querying ref type: " + err.Error())) return } } - data["ref_type"], data["ref"], data["group_name"], data["repo_name"], data["path_spec"] = ref_type, ref_name, group_name, repo_name, path_spec + params["ref_type"], params["ref"], params["path_spec"] = ref_type, ref_name, path_spec repo, err := open_git_repo(r.Context(), group_name, repo_name) if err != nil { _, _ = w.Write([]byte("Error opening repo: " + err.Error())) @@ -88,9 +86,9 @@ _, _ = w.Write([]byte("Error formatting code: " + err.Error())) return } formatted_encapsulated := template.HTML(formatted_unencapsulated.Bytes()) - data["file_contents"] = formatted_encapsulated + params["file_contents"] = formatted_encapsulated - err = templates.ExecuteTemplate(w, "repo_tree_file", data) + err = templates.ExecuteTemplate(w, "repo_tree_file", params) if err != nil { _, _ = w.Write([]byte("Error rendering template: " + err.Error())) return @@ -104,10 +102,10 @@ http.Redirect(w, r, path.Base(path_spec)+"/", http.StatusSeeOther) return } - data["readme_filename"], data["readme"] = render_readme_at_tree(target) - data["files"] = build_display_git_tree(target) + params["readme_filename"], params["readme"] = render_readme_at_tree(target) + params["files"] = build_display_git_tree(target) - err = templates.ExecuteTemplate(w, "repo_tree_dir", data) + err = templates.ExecuteTemplate(w, "repo_tree_dir", params) if err != nil { _, _ = w.Write([]byte("Error rendering template: " + err.Error())) return diff --git a/http_server.go b/http_server.go index fbf729b21a53b450d4d26f9b286fd7145e866059..4d2d77c796992f75525e758c7207b7196f62964e 100644 --- a/http_server.go +++ b/http_server.go @@ -15,11 +15,20 @@ if err != nil { http.Error(w, err.Error(), http.StatusBadRequest) return } + non_empty_last_segments_len := len(segments) + dir_mode := false + if segments[len(segments)-1] == "" { + non_empty_last_segments_len-- + dir_mode = true + } if segments[0] == ":" { if len(segments) < 2 { http.Error(w, "Blank system endpoint", http.StatusNotFound) return + } else if len(segments) == 2 && !dir_mode { + http.Redirect(w, r, r.URL.Path+"/", http.StatusSeeOther) + return } switch segments[1] { @@ -33,6 +42,18 @@ } return } + params := make(map[string]any) + params["global"] = global_data + var _user_id int + _user_id, params["username"], err = get_user_info_from_request(r) + if _user_id == 0 { + params["user_id"] = "" + } else { + params["user_id"] = string(_user_id) + } + + fmt.Printf("%#v\n", params) + separator_index := -1 for i, part := range segments { if part == ":" { @@ -40,18 +61,10 @@ separator_index = i break } } - non_empty_last_segments_len := len(segments) - dir_mode := false - if segments[len(segments)-1] == "" { - non_empty_last_segments_len-- - dir_mode = true - } - params := make(map[string]string) - _ = params switch { case non_empty_last_segments_len == 0: - handle_index(w, r) + handle_index(w, r, params) case separator_index == -1: http.Error(w, "Group indexing hasn't been implemented yet", http.StatusNotImplemented) case non_empty_last_segments_len == separator_index+1: diff --git a/schema.sql b/schema.sql index fbd9ac8238704a436309a68d8f447d6b39a4a349..63178194fc74db69d466ae01a7b0ccfd912e4fb2 100644 --- a/schema.sql +++ b/schema.sql @@ -51,6 +51,12 @@ password_algorithm TEXT NOT NULL CHECK (password_algorithm in ('argon2id')), password TEXT NOT NULL ); +CREATE TABLE sessions ( + user_id INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE, + session_id TEXT NOT NULL, + PRIMARY KEY (user_id, session_id) +); + CREATE TABLE merge_requests ( id INTEGER GENERATED ALWAYS AS IDENTITY PRIMARY KEY, repo_id INTEGER NOT NULL REFERENCES repos(id) ON DELETE CASCADE, diff --git a/templates/_header.html.tmpl b/templates/_header.html.tmpl new file mode 100644 index 0000000000000000000000000000000000000000..bfe386afc9bd11ddc89908ed8133f81f92ab9814 --- /dev/null +++ b/templates/_header.html.tmpl @@ -0,0 +1,12 @@ +{{- define "header" -}} +
+ Lindenii Forge +
+
+ {{ if ne .user_id "" }} + {{ .username }} + {{ else }} + Login + {{ end }} +
+{{- end -}} diff --git a/templates/_repo_header.html.tmpl b/templates/_repo_header.html.tmpl index 8e5baa87619bfe12dae451cb99ca32fe5b099401..8a7fd4b0f76644ff97f3efd076478ef6aef17713 100644 --- a/templates/_repo_header.html.tmpl +++ b/templates/_repo_header.html.tmpl @@ -1,5 +1,4 @@ {{- define "repo_header" -}} -Lindenii Forge / {{ .group_name }} / diff --git a/templates/group_repos.html.tmpl b/templates/group_repos.html.tmpl index f24ce9796d71d527ba224888c1c35dadaafa5ad8..1050ce45cd0cdfed032f7f4a48e2a1631b9a4563 100644 --- a/templates/group_repos.html.tmpl +++ b/templates/group_repos.html.tmpl @@ -6,6 +6,9 @@ {{ template "head_common" . }} Repos in {{ .group_name }} – Lindenii Forge +
+ {{ template "header" . }} +

Repos in {{ .group_name }} diff --git a/templates/index.html.tmpl b/templates/index.html.tmpl index e88b568e6b417860d3d36e71755f3500bb294912..a8ef4456acdc5c9112d0ce700d6e336d08ad0016 100644 --- a/templates/index.html.tmpl +++ b/templates/index.html.tmpl @@ -6,6 +6,9 @@ {{ template "head_common" . }} Index – Lindenii Forge +
+ {{ template "header" . }} +

Lindenii Forge

diff --git a/templates/repo_commit.html.tmpl b/templates/repo_commit.html.tmpl index f219d2ec1994472bab8a600ec196a0b891cffa97..6c064fc1336806a09d0dfd26a3a6219664b22808 100644 --- a/templates/repo_commit.html.tmpl +++ b/templates/repo_commit.html.tmpl @@ -7,6 +7,9 @@ {{ .group_name }}/repos/{{ .repo_name }} – Lindenii Forge
+ {{ template "header" . }} +
+
{{ template "repo_header" . }}
diff --git a/templates/repo_index.html.tmpl b/templates/repo_index.html.tmpl index 6bc3253c81449f2719ba241f3b5f3a6c107624ce..f77e10b4d12c6cd90d5cb32bf6d020a1ef2ad472 100644 --- a/templates/repo_index.html.tmpl +++ b/templates/repo_index.html.tmpl @@ -7,6 +7,9 @@ {{ .group_name }}/repos/{{ .repo_name }} – Lindenii Forge
+ {{ template "header" . }} +
+
{{ template "repo_header" . }}
diff --git a/templates/repo_log.html.tmpl b/templates/repo_log.html.tmpl index a24138cc1c9c4e89f8505393e0b536d30d563ea4..3cc719eca8b78e0c6927d20e57201ae83ca54d9c 100644 --- a/templates/repo_log.html.tmpl +++ b/templates/repo_log.html.tmpl @@ -7,6 +7,9 @@ Log of {{ .group_name }}/repos/{{ .repo_name }} – Lindenii Forge
+ {{ template "header" . }} +
+
{{ template "repo_header" . }}
diff --git a/templates/repo_raw_dir.html.tmpl b/templates/repo_raw_dir.html.tmpl index 055445d34f7e9fa9315d29e6b27fa3a06f4b1b87..a005a3242bffa750f0acc246e407d69cc4ffdb3d 100644 --- a/templates/repo_raw_dir.html.tmpl +++ b/templates/repo_raw_dir.html.tmpl @@ -7,6 +7,9 @@ {{ .group_name }}/repos/{{ .repo_name }}/{{ .path_spec }}{{ if ne .path_spec "" }}/{{ end }} – Lindenii Forge
+ {{ template "header" . }} +
+
{{ template "repo_header" . }}
diff --git a/templates/repo_tree_dir.html.tmpl b/templates/repo_tree_dir.html.tmpl index dd5ecafddac8b1b79f32175264356dfbf7fb0bde..5d2f63289821bca2693eff9c4a6bb7439d976ff7 100644 --- a/templates/repo_tree_dir.html.tmpl +++ b/templates/repo_tree_dir.html.tmpl @@ -7,6 +7,9 @@ {{ .group_name }}/repos/{{ .repo_name }}/{{ .path_spec }}{{ if ne .path_spec "" }}/{{ end }} – Lindenii Forge
+ {{ template "header" . }} +
+
{{ template "repo_header" . }}
diff --git a/templates/repo_tree_file.html.tmpl b/templates/repo_tree_file.html.tmpl index 00547d2f6e0fe9158863c654df5ccfc658277899..7b184e3d84bb5d94e6ff43bbbc1a9a8f1ba513cc 100644 --- a/templates/repo_tree_file.html.tmpl +++ b/templates/repo_tree_file.html.tmpl @@ -8,6 +8,9 @@ {{ .group_name }}/repos/{{ .repo_name }}/{{ .path_spec }} – Lindenii Forge
+ {{ template "header" . }} +
+
{{ template "repo_header" . }}

-- 2.48.1