diff --git a/.idea/plakken.iml b/.idea/plakken.iml
index 7f4273e..f10277f 100644
--- a/.idea/plakken.iml
+++ b/.idea/plakken.iml
@@ -7,4 +7,7 @@
+
+
+
\ No newline at end of file
diff --git a/.idea/sonarlint/issuestore/0/6/0607f785dfa3c3861b3239f6723eb276d8056461 b/.idea/sonarlint/issuestore/0/6/0607f785dfa3c3861b3239f6723eb276d8056461
new file mode 100644
index 0000000..cd39d2f
--- /dev/null
+++ b/.idea/sonarlint/issuestore/0/6/0607f785dfa3c3861b3239f6723eb276d8056461
@@ -0,0 +1,2 @@
+
+rgo:S3776"RRefactor this method to reduce its Cognitive Complexity from 43 to the 15 allowed.(“Ó¬ãùÿÿÿÿ8üÚ¼ÅÀ1
\ No newline at end of file
diff --git a/.idea/sonarlint/issuestore/0/e/0e6c9e46466623539d545903ef37e20d7d759ee3 b/.idea/sonarlint/issuestore/0/e/0e6c9e46466623539d545903ef37e20d7d759ee3
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/issuestore/3/8/387a88904b25e2d2817b6038db3c3570bff90d0f b/.idea/sonarlint/issuestore/3/8/387a88904b25e2d2817b6038db3c3570bff90d0f
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/issuestore/5/c/5cb1722284ad34a8a0c95e5f6c77e7c67c2a7eee b/.idea/sonarlint/issuestore/5/c/5cb1722284ad34a8a0c95e5f6c77e7c67c2a7eee
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/issuestore/8/e/8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d b/.idea/sonarlint/issuestore/8/e/8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/issuestore/a/2/a2f5f17bf5a8e6bc481c55cb5ead6143c016d565 b/.idea/sonarlint/issuestore/a/2/a2f5f17bf5a8e6bc481c55cb5ead6143c016d565
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/issuestore/b/d/bd1335292519bbb90a7518e3aee1539f47a6149f b/.idea/sonarlint/issuestore/b/d/bd1335292519bbb90a7518e3aee1539f47a6149f
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/issuestore/e/a/ea7b422455b8b60eb5b1123f19040f20653b36a4 b/.idea/sonarlint/issuestore/e/a/ea7b422455b8b60eb5b1123f19040f20653b36a4
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/issuestore/index.pb b/.idea/sonarlint/issuestore/index.pb
new file mode 100644
index 0000000..37ad8ce
--- /dev/null
+++ b/.idea/sonarlint/issuestore/index.pb
@@ -0,0 +1,17 @@
+
+5
+db.go,0\e\0e6c9e46466623539d545903ef37e20d7d759ee3
+8
+utils.go,a\2\a2f5f17bf5a8e6bc481c55cb5ead6143c016d565
+7
+main.go,0\6\0607f785dfa3c3861b3239f6723eb276d8056461
+=
+
static/app.js,5\c\5cb1722284ad34a8a0c95e5f6c77e7c67c2a7eee
+9
+ config.go,3\8\387a88904b25e2d2817b6038db3c3570bff90d0f
+A
+static/index.html,b\d\bd1335292519bbb90a7518e3aee1539f47a6149f
+@
+static/style.css,e\a\ea7b422455b8b60eb5b1123f19040f20653b36a4
+9
+ README.md,8\e\8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d
\ No newline at end of file
diff --git a/.idea/sonarlint/securityhotspotstore/0/6/0607f785dfa3c3861b3239f6723eb276d8056461 b/.idea/sonarlint/securityhotspotstore/0/6/0607f785dfa3c3861b3239f6723eb276d8056461
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/securityhotspotstore/0/e/0e6c9e46466623539d545903ef37e20d7d759ee3 b/.idea/sonarlint/securityhotspotstore/0/e/0e6c9e46466623539d545903ef37e20d7d759ee3
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/securityhotspotstore/3/8/387a88904b25e2d2817b6038db3c3570bff90d0f b/.idea/sonarlint/securityhotspotstore/3/8/387a88904b25e2d2817b6038db3c3570bff90d0f
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/securityhotspotstore/5/c/5cb1722284ad34a8a0c95e5f6c77e7c67c2a7eee b/.idea/sonarlint/securityhotspotstore/5/c/5cb1722284ad34a8a0c95e5f6c77e7c67c2a7eee
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/securityhotspotstore/8/e/8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d b/.idea/sonarlint/securityhotspotstore/8/e/8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/securityhotspotstore/a/2/a2f5f17bf5a8e6bc481c55cb5ead6143c016d565 b/.idea/sonarlint/securityhotspotstore/a/2/a2f5f17bf5a8e6bc481c55cb5ead6143c016d565
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/securityhotspotstore/b/d/bd1335292519bbb90a7518e3aee1539f47a6149f b/.idea/sonarlint/securityhotspotstore/b/d/bd1335292519bbb90a7518e3aee1539f47a6149f
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/securityhotspotstore/e/a/ea7b422455b8b60eb5b1123f19040f20653b36a4 b/.idea/sonarlint/securityhotspotstore/e/a/ea7b422455b8b60eb5b1123f19040f20653b36a4
new file mode 100644
index 0000000..e69de29
diff --git a/.idea/sonarlint/securityhotspotstore/index.pb b/.idea/sonarlint/securityhotspotstore/index.pb
new file mode 100644
index 0000000..37ad8ce
--- /dev/null
+++ b/.idea/sonarlint/securityhotspotstore/index.pb
@@ -0,0 +1,17 @@
+
+5
+db.go,0\e\0e6c9e46466623539d545903ef37e20d7d759ee3
+8
+utils.go,a\2\a2f5f17bf5a8e6bc481c55cb5ead6143c016d565
+7
+main.go,0\6\0607f785dfa3c3861b3239f6723eb276d8056461
+=
+
static/app.js,5\c\5cb1722284ad34a8a0c95e5f6c77e7c67c2a7eee
+9
+ config.go,3\8\387a88904b25e2d2817b6038db3c3570bff90d0f
+A
+static/index.html,b\d\bd1335292519bbb90a7518e3aee1539f47a6149f
+@
+static/style.css,e\a\ea7b422455b8b60eb5b1123f19040f20653b36a4
+9
+ README.md,8\e\8ec9a00bfd09b3190ac6b22251dbb1aa95a0579d
\ No newline at end of file
diff --git a/config.go b/config.go
index d9c0ab4..8630a3a 100644
--- a/config.go
+++ b/config.go
@@ -7,7 +7,7 @@ import (
"strconv"
)
-type config struct {
+type Config struct {
host string
port string
redisAddr string
@@ -17,7 +17,7 @@ type config struct {
urlLength int
}
-func getConfig() config {
+func GetConfig() Config {
err := godotenv.Load()
if err != nil {
log.Fatalf("Error loading .env file: %v", err)
@@ -42,7 +42,7 @@ func getConfig() config {
log.Fatal("Invalid PLAKKEN_REDIS_URL_LEN")
}
- conf := config{
+ return Config{
host: os.Getenv("PLAKKEN_INTERFACE"),
port: port,
redisAddr: redisAddr,
@@ -51,6 +51,4 @@ func getConfig() config {
redisDB: redisDB,
urlLength: urlLen,
}
-
- return conf
}
diff --git a/db.go b/db.go
index 5dcdd03..d6b60b7 100644
--- a/db.go
+++ b/db.go
@@ -9,7 +9,7 @@ import (
var ctx = context.Background()
-func connectDB() *redis.Client {
+func ConnectDB() *redis.Client {
localDb := redis.NewClient(&redis.Options{
Addr: currentConfig.redisAddr,
Username: currentConfig.redisUser,
@@ -40,8 +40,7 @@ func insertPaste(key string, content string, secret string, ttl time.Duration) {
}
func getContent(key string) string {
- content := db.HGet(ctx, key, "content").Val()
- return content
+ return db.HGet(ctx, key, "content").Val()
}
func deleteContent(key string) {
diff --git a/main.go b/main.go
index aa7c81c..c4cd240 100644
--- a/main.go
+++ b/main.go
@@ -10,7 +10,7 @@ import (
"strings"
)
-var currentConfig config
+var currentConfig Config
var db *redis.Client
type pasteView struct {
@@ -21,16 +21,17 @@ type pasteView struct {
func handleRequest(w http.ResponseWriter, r *http.Request) {
path := r.URL.Path
clearPath := strings.ReplaceAll(r.URL.Path, "/raw", "")
+ staticResource := "/static/"
switch r.Method {
case "GET":
if path == "/" {
http.ServeFile(w, r, "./static/index.html")
- } else if strings.HasPrefix(path, "/static/") {
+ } else if strings.HasPrefix(path, staticResource) {
fs := http.FileServer(http.Dir("./static"))
- http.Handle("/static/", http.StripPrefix("/static/", fs))
+ http.Handle(staticResource, http.StripPrefix(staticResource, fs))
} else {
- if urlExist(clearPath) {
+ if UrlExist(clearPath) {
if strings.HasSuffix(path, "/raw") {
pasteContent := getContent(clearPath)
w.Header().Set("Content-Type", "text/plain")
@@ -56,8 +57,8 @@ func handleRequest(w http.ResponseWriter, r *http.Request) {
}
case "POST":
if path == "/" {
- secret := generateSecret()
- url := "/" + generateUrl()
+ secret := GenerateSecret()
+ url := "/" + GenerateUrl()
content := r.FormValue("content")
insertPaste(url, content, secret, -1)
http.Redirect(w, r, url, http.StatusSeeOther)
@@ -65,28 +66,26 @@ func handleRequest(w http.ResponseWriter, r *http.Request) {
w.WriteHeader(http.StatusMethodNotAllowed)
}
case "DELETE":
- if strings.HasPrefix(path, "/delete") {
- urlItem := strings.Split(path, "/")
- if urlExist("/" + urlItem[2]) {
- secret := r.URL.Query().Get("secret")
- if verifySecret("/"+urlItem[2], secret) {
- deleteContent("/" + urlItem[2])
- w.WriteHeader(http.StatusNoContent)
- } else {
- w.WriteHeader(http.StatusForbidden)
+ if UrlExist(path) {
+ secret := r.URL.Query().Get("secret")
+ if secret == db.HGet(ctx, path, "secret").Val() {
+ err := db.Del(ctx, path)
+ if err != nil {
+ log.Println(err)
}
+ w.WriteHeader(http.StatusNoContent)
} else {
- w.WriteHeader(http.StatusNotFound)
+ w.WriteHeader(http.StatusForbidden)
}
} else {
- w.WriteHeader(http.StatusMethodNotAllowed)
+ w.WriteHeader(http.StatusNotFound)
}
}
}
func main() {
- db = connectDB()
- currentConfig = getConfig()
+ db = ConnectDB()
+ currentConfig = GetConfig()
listen := currentConfig.host + ":" + currentConfig.port
http.HandleFunc("/", handleRequest)
diff --git a/static/app.js b/static/app.js
index e69de29..bef2c56 100644
--- a/static/app.js
+++ b/static/app.js
@@ -0,0 +1,31 @@
+const codeEditor = document.getElementById('content');
+const lineCounter = document.getElementById('lines');
+
+let lineCountCache = 0;
+
+// Update line counter
+function updateLineCounter() {
+ const lineCount = codeEditor.value.split('\n').length;
+
+ if (lineCountCache !== lineCount) {
+ const outarr = Array.from({length: lineCount}, (_, index) => index + 1);
+ lineCounter.value = outarr.join('\n');
+ }
+
+ lineCountCache = lineCount;
+}
+
+codeEditor.addEventListener('input', updateLineCounter);
+
+codeEditor.addEventListener('keydown', (e) => {
+ if (e.key === 'Tab') {
+ e.preventDefault();
+
+ const {value, selectionStart, selectionEnd} = codeEditor;
+ codeEditor.value = `${value.slice(0, selectionStart)}\t${value.slice(selectionEnd)}`;
+ codeEditor.setSelectionRange(selectionStart + 1, selectionStart + 1);
+ updateLineCounter();
+ }
+});
+
+updateLineCounter();
diff --git a/static/index.html b/static/index.html
index 10504d4..40eb943 100644
--- a/static/index.html
+++ b/static/index.html
@@ -9,50 +9,57 @@
New plak • Plakken
+