itRework database to allow random flag submissions - scoreboard - Interactive scoreboard for CTF-like games	Err	z3bra.org	70
hgit clone git://git.z3bra.org/scoreboard.git	URL:git://git.z3bra.org/scoreboard.git	z3bra.org	70
1Log	/scm/scoreboard/log.gph	z3bra.org	70
1Files	/scm/scoreboard/files.gph	z3bra.org	70
1Refs	/scm/scoreboard/refs.gph	z3bra.org	70
i---	Err	z3bra.org	70
1commit f2372a7f800172e4b59c983b08daff889b05274b	/scm/scoreboard/commit/f2372a7f800172e4b59c983b08daff889b05274b.gph	z3bra.org	70
1parent 18522b155c6c058696e5699d7d321ddebb4302b1	/scm/scoreboard/commit/18522b155c6c058696e5699d7d321ddebb4302b1.gph	z3bra.org	70
hAuthor: Willy Goiffon <contact@z3bra.org>	URL:mailto:contact@z3bra.org	z3bra.org	70
iDate:   Wed, 25 Sep 2024 22:59:01 +0200	Err	z3bra.org	70
i	Err	z3bra.org	70
iRework database to allow random flag submissions	Err	z3bra.org	70
i	Err	z3bra.org	70
iDiffstat:	Err	z3bra.org	70
i  M db.go                               |     103 +++++++++----------------------	Err	z3bra.org	70
i  M html.go                             |       3 +++	Err	z3bra.org	70
i  M main.go                             |     107 +++++++++++++------------------	Err	z3bra.org	70
i  M player.go                           |     116 +++++++++++++++----------------	Err	z3bra.org	70
i  M playerbox.go                        |      15 +++++++--------	Err	z3bra.org	70
i  M ui.go                               |       7 ++++---	Err	z3bra.org	70
i	Err	z3bra.org	70
i6 files changed, 143 insertions(+), 208 deletions(-)	Err	z3bra.org	70
i---	Err	z3bra.org	70
1diff --git a/db.go b/db.go	/scm/scoreboard/file/db.go.gph	z3bra.org	70
it@@ -23,17 +23,23 @@ const (	Err	z3bra.org	70
i         // DB queries	Err	z3bra.org	70
i         DB_CREATE string = `	Err	z3bra.org	70
i         CREATE TABLE IF NOT EXISTS	Err	z3bra.org	70
i-          score(	Err	z3bra.org	70
i-            hash TEXT,	Err	z3bra.org	70
i-            name TEXT,	Err	z3bra.org	70
i-            flag INT,	Err	z3bra.org	70
i+          user(	Err	z3bra.org	70
i+            name TEXT PRIMARY KEY,	Err	z3bra.org	70
i+            hash TEXT NOT NULL UNIQUE,	Err	z3bra.org	70
i             score INT,	Err	z3bra.org	70
i+            flag INT,	Err	z3bra.org	70
i             ts INT	Err	z3bra.org	70
i           );	Err	z3bra.org	70
i         CREATE TABLE IF NOT EXISTS	Err	z3bra.org	70
i           flag(	Err	z3bra.org	70
i-            chapter INT,	Err	z3bra.org	70
i-            value TEXT	Err	z3bra.org	70
i+            value TEXT PRIMARY KEY,	Err	z3bra.org	70
i+            badge TEXT,	Err	z3bra.org	70
i+            score INT	Err	z3bra.org	70
i+          );	Err	z3bra.org	70
i+        CREATE TABLE IF NOT EXISTS	Err	z3bra.org	70
i+          score(	Err	z3bra.org	70
i+            name TEXT,	Err	z3bra.org	70
i+            flag TEXT	Err	z3bra.org	70
i           );	Err	z3bra.org	70
i         `	Err	z3bra.org	70
i )	Err	z3bra.org	70
it@@ -57,61 +63,31 @@ func db_init(file string) (*sql.DB, error) {	Err	z3bra.org	70
i         return db, nil	Err	z3bra.org	70
i }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-func db_count(db *sql.DB) int {	Err	z3bra.org	70
i-        var count int	Err	z3bra.org	70
i-        query := `SELECT count(*) FROM score;`	Err	z3bra.org	70
i-        row := db.QueryRow(query)	Err	z3bra.org	70
i-        row.Scan(&count)	Err	z3bra.org	70
i-        return count	Err	z3bra.org	70
i-}	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-func db_score_count(db *sql.DB, score, ts int) int {	Err	z3bra.org	70
i-        var count int	Err	z3bra.org	70
i-        query := `SELECT	Err	z3bra.org	70
i-          count(id)	Err	z3bra.org	70
i-          FROM score	Err	z3bra.org	70
i-          WHERE	Err	z3bra.org	70
i-            score >= ? AND	Err	z3bra.org	70
i-            ts => ?	Err	z3bra.org	70
i-        ;`	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-        row := db.QueryRow(query, score, ts)	Err	z3bra.org	70
i-        row.Scan(&count)	Err	z3bra.org	70
i-        return count	Err	z3bra.org	70
i-}	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-func db_flag_count(db *sql.DB, flag int) int {	Err	z3bra.org	70
i-        var count int	Err	z3bra.org	70
i-        query := `SELECT	Err	z3bra.org	70
i-          count(*)	Err	z3bra.org	70
i-          FROM score	Err	z3bra.org	70
i-          WHERE	Err	z3bra.org	70
i-            flag >= ?	Err	z3bra.org	70
i-        ;`	Err	z3bra.org	70
i+func db_get_flags(db *sql.DB) ([]Flag, error) {	Err	z3bra.org	70
i+        query := `SELECT rowid,value,badge,score FROM flag ORDER BY score;`	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-        row := db.QueryRow(query, flag)	Err	z3bra.org	70
i-        row.Scan(&count)	Err	z3bra.org	70
i-        return count	Err	z3bra.org	70
i-}	Err	z3bra.org	70
i+        rows, err := db.Query(query)	Err	z3bra.org	70
i+        if err != nil {	Err	z3bra.org	70
i+                return nil, err	Err	z3bra.org	70
i+        }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-func db_id(db *sql.DB, nick string) bool {	Err	z3bra.org	70
i-        var count int	Err	z3bra.org	70
i-        query := `SELECT	Err	z3bra.org	70
i-          count(*)	Err	z3bra.org	70
i-          FROM score	Err	z3bra.org	70
i-          WHERE	Err	z3bra.org	70
i-            name = ?	Err	z3bra.org	70
i-        ;`	Err	z3bra.org	70
i+        flags := make([]Flag, 0)	Err	z3bra.org	70
i+        for rows.Next() {	Err	z3bra.org	70
i+                var flag Flag	Err	z3bra.org	70
i+                err := rows.Scan(&flag.id, &flag.value, &flag.badge, &flag.score)	Err	z3bra.org	70
i+                if err != nil {	Err	z3bra.org	70
i+                        return nil, err	Err	z3bra.org	70
i+                }	Err	z3bra.org	70
i+                flags = append(flags, flag)	Err	z3bra.org	70
i+        }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-        row := db.QueryRow(query, nick)	Err	z3bra.org	70
i-        row.Scan(&count)	Err	z3bra.org	70
i-        return (count > 0)	Err	z3bra.org	70
i+        return flags, nil	Err	z3bra.org	70
i }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i func db_ranked_players(db *sql.DB, offset, limit int) ([]Player, error) {	Err	z3bra.org	70
i         query := `SELECT	Err	z3bra.org	70
i           name,flag,score,ts	Err	z3bra.org	70
i-          FROM score	Err	z3bra.org	70
i+          FROM user	Err	z3bra.org	70
i           ORDER BY	Err	z3bra.org	70
i             score DESC,	Err	z3bra.org	70
i             flag DESC,	Err	z3bra.org	70
it@@ -137,24 +113,3 @@ func db_ranked_players(db *sql.DB, offset, limit int) ([]Player, error) {	Err	z3bra.org	70
i 	Err	z3bra.org	70
i         return players, nil	Err	z3bra.org	70
i }	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-func db_flags(db *sql.DB) ([]Flag, error) {	Err	z3bra.org	70
i-        query := `SELECT chapter,value FROM flag ORDER BY chapter;`	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-        rows, err := db.Query(query)	Err	z3bra.org	70
i-        if err != nil {	Err	z3bra.org	70
i-                return nil, err	Err	z3bra.org	70
i-        }	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-        flags := make([]Flag, 0)	Err	z3bra.org	70
i-        for rows.Next() {	Err	z3bra.org	70
i-                var flag Flag	Err	z3bra.org	70
i-                err := rows.Scan(&flag.chapter, &flag.value)	Err	z3bra.org	70
i-                if err != nil {	Err	z3bra.org	70
i-                        return nil, err	Err	z3bra.org	70
i-                }	Err	z3bra.org	70
i-                flags = append(flags, flag)	Err	z3bra.org	70
i-        }	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-        return flags, nil	Err	z3bra.org	70
i-}	Err	z3bra.org	70
1diff --git a/html.go b/html.go	/scm/scoreboard/file/html.go.gph	z3bra.org	70
it@@ -53,10 +53,13 @@ var html string = `	Err	z3bra.org	70
i `	Err	z3bra.org	70
i 	Err	z3bra.org	70
i func (a *Application) GenerateHTML() {	Err	z3bra.org	70
i+        players := make([]Player, 0)	Err	z3bra.org	70
i+        /*	Err	z3bra.org	70
i         players, err := db_ranked_players(a.db, 0, -1)	Err	z3bra.org	70
i         if err != nil {	Err	z3bra.org	70
i                 panic(err)	Err	z3bra.org	70
i         }	Err	z3bra.org	70
i+        */	Err	z3bra.org	70
i 	Err	z3bra.org	70
i         data := Template{}	Err	z3bra.org	70
i         for i:=0; i<len(players); i++ {	Err	z3bra.org	70
1diff --git a/main.go b/main.go	/scm/scoreboard/file/main.go.gph	z3bra.org	70
it@@ -42,8 +42,10 @@ Save it carefully, do not share it.	Err	z3bra.org	70
i )	Err	z3bra.org	70
i 	Err	z3bra.org	70
i type Flag struct {	Err	z3bra.org	70
i-        chapter int	Err	z3bra.org	70
i+        id int	Err	z3bra.org	70
i         value string	Err	z3bra.org	70
i+        badge string	Err	z3bra.org	70
i+        score int	Err	z3bra.org	70
i }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i type Application struct {	Err	z3bra.org	70
it@@ -58,7 +60,7 @@ type Application struct {	Err	z3bra.org	70
i         player *Player	Err	z3bra.org	70
i }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-var cyboard Application	Err	z3bra.org	70
i+var scoreboard Application	Err	z3bra.org	70
i 	Err	z3bra.org	70
i func usage() {	Err	z3bra.org	70
i         fmt.Println("ssh -t board@cyb.farm [FLAG]")	Err	z3bra.org	70
it@@ -67,25 +69,14 @@ func usage() {	Err	z3bra.org	70
i 	Err	z3bra.org	70
i 	Err	z3bra.org	70
i func flagid(hash string) int {	Err	z3bra.org	70
i-        for i := 0; i<len(cyboard.flag_ref); i++ {	Err	z3bra.org	70
i-                if strings.ToUpper(hash) == cyboard.flag_ref[i].value {	Err	z3bra.org	70
i-                        return cyboard.flag_ref[i].chapter	Err	z3bra.org	70
i+        for i := 0; i<len(scoreboard.flag_ref); i++ {	Err	z3bra.org	70
i+                if strings.ToUpper(hash) == scoreboard.flag_ref[i].value {	Err	z3bra.org	70
i+                        return scoreboard.flag_ref[i].id	Err	z3bra.org	70
i                 }	Err	z3bra.org	70
i         }	Err	z3bra.org	70
i         return -1	Err	z3bra.org	70
i }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-func scoreDump() {	Err	z3bra.org	70
i-        players, err := db_ranked_players(cyboard.db, 0, -1)	Err	z3bra.org	70
i-        if err != nil {	Err	z3bra.org	70
i-                panic(err)	Err	z3bra.org	70
i-        }	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-        for i:=0; i<len(players); i++ {	Err	z3bra.org	70
i-                fmt.Printf("%s\t%d\t%d\n", players[i].name, players[i].flag, players[i].score)	Err	z3bra.org	70
i-        }	Err	z3bra.org	70
i-}	Err	z3bra.org	70
i-	Err	z3bra.org	70
i func pageToken() tview.Primitive {	Err	z3bra.org	70
i         input := tview.NewInputField().	Err	z3bra.org	70
i                 SetLabel("TOKEN ").	Err	z3bra.org	70
it@@ -111,34 +102,34 @@ func pageToken() tview.Primitive {	Err	z3bra.org	70
i                         }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i                         if len(input.GetText()) != 24 {	Err	z3bra.org	70
i-                                cyboard.Popup("ERROR", "Invalid token format")	Err	z3bra.org	70
i+                                scoreboard.Popup("ERROR", "Invalid token format")	Err	z3bra.org	70
i                                 return	Err	z3bra.org	70
i                         }	Err	z3bra.org	70
i-                        err := cyboard.player.FromToken(input.GetText())	Err	z3bra.org	70
i+                        err := scoreboard.player.FromToken(input.GetText())	Err	z3bra.org	70
i                         if err != nil {	Err	z3bra.org	70
i-                                cyboard.Fatal(err)	Err	z3bra.org	70
i+                                scoreboard.Fatal(err)	Err	z3bra.org	70
i                                 return	Err	z3bra.org	70
i                         }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-                        err = cyboard.player.Submit(cyboard.flag)	Err	z3bra.org	70
i+                        err = scoreboard.player.Submit(scoreboard.flag)	Err	z3bra.org	70
i                         if err != nil {	Err	z3bra.org	70
i-                                cyboard.Fatal(err)	Err	z3bra.org	70
i+                                scoreboard.Fatal(err)	Err	z3bra.org	70
i                                 return	Err	z3bra.org	70
i                         }	Err	z3bra.org	70
i-                        cyboard.HighlightBoard(cyboard.player.ScoreRank())	Err	z3bra.org	70
i-                        cyboard.pages.SwitchToPage("board")	Err	z3bra.org	70
i-                        cyboard.GenerateHTML()	Err	z3bra.org	70
i+                        scoreboard.HighlightBoard(scoreboard.player.ScoreRank())	Err	z3bra.org	70
i+                        scoreboard.pages.SwitchToPage("board")	Err	z3bra.org	70
i+                        scoreboard.GenerateHTML()	Err	z3bra.org	70
i                 })	Err	z3bra.org	70
i 	Err	z3bra.org	70
i         return center(40, 1, input)	Err	z3bra.org	70
i }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i func pageBoard() tview.Primitive {	Err	z3bra.org	70
i-        cyboard.SetupFrame()	Err	z3bra.org	70
i-        cyboard.DrawBoard()	Err	z3bra.org	70
i+        scoreboard.SetupFrame()	Err	z3bra.org	70
i+        scoreboard.DrawBoard()	Err	z3bra.org	70
i 	Err	z3bra.org	70
i         // center frame on screen, counting borders + header + footer	Err	z3bra.org	70
i-        return center(BOARD_WIDTH + 2, BOARD_HEIGHT + 7, cyboard.frame)	Err	z3bra.org	70
i+        return center(BOARD_WIDTH + 2, BOARD_HEIGHT + 7, scoreboard.frame)	Err	z3bra.org	70
i }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i func main() {	Err	z3bra.org	70
it@@ -164,26 +155,25 @@ func main() {	Err	z3bra.org	70
i         tview.Styles.GraphicsColor            = tcell.ColorDefault	Err	z3bra.org	70
i         tview.Styles.PrimaryTextColor         = tcell.ColorDefault	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-        cyboard.db, err = db_init(*db)	Err	z3bra.org	70
i+        scoreboard.db, err = db_init(*db)	Err	z3bra.org	70
i         if err != nil {	Err	z3bra.org	70
i                 panic(err)	Err	z3bra.org	70
i         }	Err	z3bra.org	70
i-        defer cyboard.db.Close()	Err	z3bra.org	70
i+        defer scoreboard.db.Close()	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-        cyboard.flag_ref, err = db_flags(cyboard.db)	Err	z3bra.org	70
i+        scoreboard.flag_ref, err = db_get_flags(scoreboard.db)	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-        cyboard.flag = 0	Err	z3bra.org	70
i-        cyboard.html = *html	Err	z3bra.org	70
i-        cyboard.app = tview.NewApplication()	Err	z3bra.org	70
i-        cyboard.pages = tview.NewPages()	Err	z3bra.org	70
i-        //cyboard.frame = tview.NewFrame(tview.NewGrid())	Err	z3bra.org	70
i-        cyboard.board = tview.NewFlex()	Err	z3bra.org	70
i-        cyboard.player = &Player{ db: cyboard.db }	Err	z3bra.org	70
i+        scoreboard.flag = 0	Err	z3bra.org	70
i+        scoreboard.html = *html	Err	z3bra.org	70
i+        scoreboard.app = tview.NewApplication()	Err	z3bra.org	70
i+        scoreboard.pages = tview.NewPages()	Err	z3bra.org	70
i+        scoreboard.board = tview.NewFlex()	Err	z3bra.org	70
i+        scoreboard.player = &Player{ db: scoreboard.db }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-        cyboard.pages.SetBackgroundColor(tcell.ColorDefault)	Err	z3bra.org	70
i+        scoreboard.pages.SetBackgroundColor(tcell.ColorDefault)	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-        cyboard.pages.AddPage("token",  pageToken(), true, false)	Err	z3bra.org	70
i-        cyboard.pages.AddPage("board",  pageBoard(), true, false)	Err	z3bra.org	70
i+        scoreboard.pages.AddPage("token",  pageToken(), true, false)	Err	z3bra.org	70
i+        scoreboard.pages.AddPage("board",  pageBoard(), true, false)	Err	z3bra.org	70
i 	Err	z3bra.org	70
i         args := flag.Args()	Err	z3bra.org	70
i 	Err	z3bra.org	70
it@@ -193,46 +183,37 @@ func main() {	Err	z3bra.org	70
i                 if args[0] == "help" {	Err	z3bra.org	70
i                         usage()	Err	z3bra.org	70
i                 }	Err	z3bra.org	70
i-                if args[0] == "dump" {	Err	z3bra.org	70
i-                        scoreDump()	Err	z3bra.org	70
i-                        os.Exit(0)	Err	z3bra.org	70
i-                }	Err	z3bra.org	70
i                 if args[0] == "refresh" {	Err	z3bra.org	70
i-                        cyboard.GenerateHTML()	Err	z3bra.org	70
i+                        scoreboard.GenerateHTML()	Err	z3bra.org	70
i                         os.Exit(0)	Err	z3bra.org	70
i                 }	Err	z3bra.org	70
i-                switch cyboard.flag = flagid(args[0]) + 1; cyboard.flag {	Err	z3bra.org	70
i+                switch scoreboard.flag = flagid(args[0]) + 1; scoreboard.flag {	Err	z3bra.org	70
i                 case 0:	Err	z3bra.org	70
i                         fmt.Println("Incorrect flag")	Err	z3bra.org	70
i                         return	Err	z3bra.org	70
i                 case 1:	Err	z3bra.org	70
i-                        cyboard.player.flag = cyboard.flag	Err	z3bra.org	70
i-                        cyboard.player.score = 100	Err	z3bra.org	70
i-                        cyboard.player.ts = time.Now().Unix()	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-                        // Bonus points for the first player to submit a flag	Err	z3bra.org	70
i-                        if cyboard.player.FlagRank() == 0 {	Err	z3bra.org	70
i-                                cyboard.player.score += cyboard.flag * 10	Err	z3bra.org	70
i-                        }	Err	z3bra.org	70
i+                        scoreboard.player.flag = scoreboard.flag	Err	z3bra.org	70
i+                        scoreboard.player.score = 100	Err	z3bra.org	70
i+                        scoreboard.player.ts = time.Now().Unix()	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-                        rank := cyboard.player.ScoreRank() + 1	Err	z3bra.org	70
i+                        rank := scoreboard.player.ScoreRank() + 1	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-                        cyboard.NewPlayer(rank)	Err	z3bra.org	70
i-                        cyboard.pages.SwitchToPage("board")	Err	z3bra.org	70
i+                        scoreboard.NewPlayer(rank)	Err	z3bra.org	70
i+                        scoreboard.pages.SwitchToPage("board")	Err	z3bra.org	70
i                 default:	Err	z3bra.org	70
i-                        cyboard.pages.SwitchToPage("token")	Err	z3bra.org	70
i+                        scoreboard.pages.SwitchToPage("token")	Err	z3bra.org	70
i                 }	Err	z3bra.org	70
i         } else {	Err	z3bra.org	70
i-                cyboard.pages.SwitchToPage("board")	Err	z3bra.org	70
i-                cyboard.DrawBoard()	Err	z3bra.org	70
i+                scoreboard.pages.SwitchToPage("board")	Err	z3bra.org	70
i+                scoreboard.DrawBoard()	Err	z3bra.org	70
i         }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-        if err := cyboard.app.SetRoot(cyboard.pages, true).EnableMouse(true).Run(); err != nil {	Err	z3bra.org	70
i+        if err := scoreboard.app.SetRoot(scoreboard.pages, true).EnableMouse(true).Run(); err != nil {	Err	z3bra.org	70
i                 fmt.Println(err)	Err	z3bra.org	70
i                 os.Exit(1)	Err	z3bra.org	70
i         }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-        if cyboard.player.token != "" && cyboard.flag < 7 {	Err	z3bra.org	70
i-                fmt.Printf(TOKEN_REMINDER, cyboard.player.name, humanize.Ordinal(cyboard.flag + 1), cyboard.player.token)	Err	z3bra.org	70
i+        if scoreboard.player.token != "" && scoreboard.flag < 7 {	Err	z3bra.org	70
i+                fmt.Printf(TOKEN_REMINDER, scoreboard.player.name, humanize.Ordinal(scoreboard.flag + 1), scoreboard.player.token)	Err	z3bra.org	70
i         }	Err	z3bra.org	70
i }	Err	z3bra.org	70
1diff --git a/player.go b/player.go	/scm/scoreboard/file/player.go.gph	z3bra.org	70
it@@ -29,6 +29,7 @@ import (	Err	z3bra.org	70
i 	Err	z3bra.org	70
i type Player struct {	Err	z3bra.org	70
i         db *sql.DB	Err	z3bra.org	70
i+        id int	Err	z3bra.org	70
i         token string	Err	z3bra.org	70
i         name string	Err	z3bra.org	70
i         flag int	Err	z3bra.org	70
it@@ -36,6 +37,7 @@ type Player struct {	Err	z3bra.org	70
i         ts int64	Err	z3bra.org	70
i }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i+/* Randomize a buffer of a given length */	Err	z3bra.org	70
i func randbuf(length int64) []byte {	Err	z3bra.org	70
i         b := make([]byte, length)	Err	z3bra.org	70
i         _, err := rand.Read(b)	Err	z3bra.org	70
it@@ -45,14 +47,14 @@ func randbuf(length int64) []byte {	Err	z3bra.org	70
i         return b	Err	z3bra.org	70
i }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-func tokenize(name string) (string, string, error) {	Err	z3bra.org	70
i+/* Generate a random base32 token using the provided input as a salt */	Err	z3bra.org	70
i+func mktoken(input string) (string, string, error) {	Err	z3bra.org	70
i         key := randbuf(12)	Err	z3bra.org	70
i-        salt := base32.StdEncoding.EncodeToString([]byte(name))	Err	z3bra.org	70
i+        salt := base32.StdEncoding.EncodeToString([]byte(input))	Err	z3bra.org	70
i 	Err	z3bra.org	70
i         token := key	Err	z3bra.org	70
i-        token = append(token, []byte(name)...)	Err	z3bra.org	70
i+        token = append(token, []byte(input)...)	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-        // use name as salt	Err	z3bra.org	70
i         dk, err := scrypt.Key(key, []byte(salt), 1<<15, 8, 1, 32)	Err	z3bra.org	70
i         if err != nil {	Err	z3bra.org	70
i                 return "", "", err	Err	z3bra.org	70
it@@ -63,16 +65,19 @@ func tokenize(name string) (string, string, error) {	Err	z3bra.org	70
i         return token32, hash32, nil	Err	z3bra.org	70
i }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i+/* Register a user in the database */	Err	z3bra.org	70
i func (p *Player) Register() error {	Err	z3bra.org	70
i         var hash string	Err	z3bra.org	70
i         var err error	Err	z3bra.org	70
i-        p.token, hash, err = tokenize(p.name)	Err	z3bra.org	70
i+	Err	z3bra.org	70
i+        p.ts = time.Now().Unix()	Err	z3bra.org	70
i+        p.token, hash, err = mktoken(p.name)	Err	z3bra.org	70
i         if err != nil {	Err	z3bra.org	70
i                 return err	Err	z3bra.org	70
i         }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-        query := `INSERT INTO score(name,hash,flag,score,ts) VALUES(?,?,?,?,?);`	Err	z3bra.org	70
i-        _, err = p.db.Exec(query, p.name, hash, p.flag, p.score, p.ts)	Err	z3bra.org	70
i+        query := `INSERT INTO score(name,hash,ts) VALUES(?,?,?);`	Err	z3bra.org	70
i+        _, err = p.db.Exec(query, p.name, hash, p.ts)	Err	z3bra.org	70
i         if err != nil {	Err	z3bra.org	70
i                 return err	Err	z3bra.org	70
i         }	Err	z3bra.org	70
it@@ -80,19 +85,36 @@ func (p *Player) Register() error {	Err	z3bra.org	70
i         return nil	Err	z3bra.org	70
i }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-func (p *Player) Update() error {	Err	z3bra.org	70
i-        var hash string	Err	z3bra.org	70
i+func (p *Player) Fetch() error {	Err	z3bra.org	70
i+        /* Fill player struct with basic info */	Err	z3bra.org	70
i+        query := `SELECT rowid,ts FROM user WHERE name = ?;`	Err	z3bra.org	70
i+        row := p.db.QueryRow(query, p.name)	Err	z3bra.org	70
i+        row.Scan(&p.id, &p.ts)	Err	z3bra.org	70
i+	Err	z3bra.org	70
i+        /* Calculate score based on submitted flags */	Err	z3bra.org	70
i+        query = `SELECT	Err	z3bra.org	70
i+          COUNT(flag.score), SUM(flag.score)	Err	z3bra.org	70
i+          FROM flag	Err	z3bra.org	70
i+          INNER JOIN score ON score.flag = flag.value	Err	z3bra.org	70
i+          WHERE score.name = ?;`	Err	z3bra.org	70
i+	Err	z3bra.org	70
i+        row = p.db.QueryRow(query, p.name)	Err	z3bra.org	70
i+        row.Scan(&p.flag, &p.score)	Err	z3bra.org	70
i+	Err	z3bra.org	70
i+        return nil	Err	z3bra.org	70
i+}	Err	z3bra.org	70
i+	Err	z3bra.org	70
i+func (p *Player) Refresh(score int, flag int, ts int64) error {	Err	z3bra.org	70
i         var err error	Err	z3bra.org	70
i-        p.token, hash, err = tokenize(p.name)	Err	z3bra.org	70
i-        if err != nil {	Err	z3bra.org	70
i-                return err	Err	z3bra.org	70
i-        }	Err	z3bra.org	70
i-        query := `UPDATE score SET hash = ?, flag = ?, score = ?, ts = ? WHERE name = ?;`	Err	z3bra.org	70
i-        _, err = p.db.Exec(query, hash, p.flag, p.score, p.ts, p.name)	Err	z3bra.org	70
i+	Err	z3bra.org	70
i+        query := `UPDATE user SET score = ?, flag = ?, ts = ? WHERE name = ?;`	Err	z3bra.org	70
i+        _, err = p.db.Exec(query, score, flag, ts, p.name)	Err	z3bra.org	70
i         if err != nil {	Err	z3bra.org	70
i                 return err	Err	z3bra.org	70
i         }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i+        p.ts = ts	Err	z3bra.org	70
i+	Err	z3bra.org	70
i         return nil	Err	z3bra.org	70
i }	Err	z3bra.org	70
i 	Err	z3bra.org	70
it@@ -100,7 +122,7 @@ func (p *Player) ScoreRank() int {	Err	z3bra.org	70
i         var count int	Err	z3bra.org	70
i         query := `SELECT	Err	z3bra.org	70
i           count(*)	Err	z3bra.org	70
i-          FROM score	Err	z3bra.org	70
i+          FROM user	Err	z3bra.org	70
i           WHERE	Err	z3bra.org	70
i             name != ? AND (score > ? OR (score == ? AND ts <= ?))	Err	z3bra.org	70
i         ;`	Err	z3bra.org	70
it@@ -110,31 +132,8 @@ func (p *Player) ScoreRank() int {	Err	z3bra.org	70
i         return count	Err	z3bra.org	70
i }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-func (p *Player) FlagRank() int {	Err	z3bra.org	70
i-        var count int	Err	z3bra.org	70
i-        query := `SELECT	Err	z3bra.org	70
i-          count(*)	Err	z3bra.org	70
i-          FROM score	Err	z3bra.org	70
i-          WHERE	Err	z3bra.org	70
i-            flag >= ?	Err	z3bra.org	70
i-        ;`	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-        row := p.db.QueryRow(query, p.flag)	Err	z3bra.org	70
i-        row.Scan(&count)	Err	z3bra.org	70
i-        return count	Err	z3bra.org	70
i-}	Err	z3bra.org	70
i-	Err	z3bra.org	70
i func (p *Player) FlagStr() string {	Err	z3bra.org	70
i-        var str [7]byte	Err	z3bra.org	70
i-        for i:=0; i <len(str); i++ {	Err	z3bra.org	70
i-                if i < p.flag {	Err	z3bra.org	70
i-                        str[i] = 'X'	Err	z3bra.org	70
i-                } else {	Err	z3bra.org	70
i-                        str[i] = '.'	Err	z3bra.org	70
i-                }	Err	z3bra.org	70
i-        }	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-        return fmt.Sprintf("%s", str)	Err	z3bra.org	70
i+        return fmt.Sprintf("%2d/%d", p.flag, len(scoreboard.flag_ref))	Err	z3bra.org	70
i }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i func (p *Player) RankStr() string {	Err	z3bra.org	70
it@@ -163,23 +162,19 @@ func (p *Player) Exists() bool {	Err	z3bra.org	70
i }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i func (p *Player) Submit(flag int) error {	Err	z3bra.org	70
i-        if flag <= p.flag {	Err	z3bra.org	70
i-                return errors.New(fmt.Sprintf("Flag already set for %s", p.name))	Err	z3bra.org	70
i-        }	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-        if flag != p.flag + 1 {	Err	z3bra.org	70
i-                return errors.New(fmt.Sprintf("Missing %s flag for %s", humanize.Ordinal(p.flag + 1), p.name))	Err	z3bra.org	70
i-        }	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-        p.ts = time.Now().Unix()	Err	z3bra.org	70
i-        p.flag = flag	Err	z3bra.org	70
i-        p.score += 100	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-        if p.FlagRank() == 0 {	Err	z3bra.org	70
i-                p.score += 10 * flag	Err	z3bra.org	70
i-        }	Err	z3bra.org	70
i-	Err	z3bra.org	70
i-        err := p.Update()	Err	z3bra.org	70
i+        var ts int64	Err	z3bra.org	70
i+        var score int	Err	z3bra.org	70
i+        var flags int	Err	z3bra.org	70
i+	Err	z3bra.org	70
i+        // TODO: check flag existence	Err	z3bra.org	70
i+        // TODO: check flag already submitted	Err	z3bra.org	70
i+        // TODO: retrieve flag score	Err	z3bra.org	70
i+        ts = time.Now().Unix()	Err	z3bra.org	70
i+        score = p.score // + flag_score	Err	z3bra.org	70
i+        flags = p.flag + 1	Err	z3bra.org	70
i+	Err	z3bra.org	70
i+        // update user status in database	Err	z3bra.org	70
i+        err := p.Refresh(score, flags, ts)	Err	z3bra.org	70
i         if err != nil {	Err	z3bra.org	70
i                 return err	Err	z3bra.org	70
i         }	Err	z3bra.org	70
it@@ -187,6 +182,7 @@ func (p *Player) Submit(flag int) error {	Err	z3bra.org	70
i         return nil	Err	z3bra.org	70
i }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i+/* Retrieve username from given token */	Err	z3bra.org	70
i func (p *Player) FromToken(token string) error {	Err	z3bra.org	70
i         var err error	Err	z3bra.org	70
i         blob, err := base32.StdEncoding.DecodeString(token)	Err	z3bra.org	70
it@@ -205,12 +201,12 @@ func (p *Player) FromToken(token string) error {	Err	z3bra.org	70
i                 return err	Err	z3bra.org	70
i         }	Err	z3bra.org	70
i         hash := base32.StdEncoding.EncodeToString(dk)	Err	z3bra.org	70
i-        query := `SELECT name,flag,score,ts FROM score WHERE name = ? AND hash = ?`	Err	z3bra.org	70
i+        query := `SELECT name,flag,score,ts FROM score WHERE hash = ?`	Err	z3bra.org	70
i 	Err	z3bra.org	70
i-        row := p.db.QueryRow(query, p.name, hash)	Err	z3bra.org	70
i+        row := p.db.QueryRow(query, hash)	Err	z3bra.org	70
i         err = row.Scan(&p.name, &p.flag, &p.score, &p.ts)	Err	z3bra.org	70
i         if err == sql.ErrNoRows {	Err	z3bra.org	70
i-                return errors.New("Invalid token")	Err	z3bra.org	70
i+                return errors.New("Unknown token")	Err	z3bra.org	70
i         }	Err	z3bra.org	70
i 	Err	z3bra.org	70
i         return nil	Err	z3bra.org	70
1diff --git a/playerbox.go b/playerbox.go	/scm/scoreboard/file/playerbox.go.gph	z3bra.org	70
it@@ -2,7 +2,6 @@ package main	Err	z3bra.org	70
i 	Err	z3bra.org	70
i import (	Err	z3bra.org	70
i         "fmt"	Err	z3bra.org	70
i-        //"time"	Err	z3bra.org	70
i         "github.com/gdamore/tcell/v2"	Err	z3bra.org	70
i         "github.com/rivo/tview"	Err	z3bra.org	70
i         "github.com/dustin/go-humanize"	Err	z3bra.org	70
it@@ -82,7 +81,7 @@ func PlayerBoxName(p *Player) *tview.TextView {	Err	z3bra.org	70
i                 SetTextAlign(tview.AlignRight).	Err	z3bra.org	70
i                 SetText(boxtext(playerbox)).	Err	z3bra.org	70
i                 SetChangedFunc(func() {	Err	z3bra.org	70
i-                        cyboard.app.Draw()	Err	z3bra.org	70
i+                        scoreboard.app.Draw()	Err	z3bra.org	70
i                 }).	Err	z3bra.org	70
i                 SetDoneFunc(func(key tcell.Key) {	Err	z3bra.org	70
i                         if key == tcell.KeyEnter {	Err	z3bra.org	70
it@@ -90,19 +89,19 @@ func PlayerBoxName(p *Player) *tview.TextView {	Err	z3bra.org	70
i                                 if ! p.Exists() {	Err	z3bra.org	70
i                                         err := p.Register()	Err	z3bra.org	70
i                                         if err != nil {	Err	z3bra.org	70
i-                                                cyboard.Fatal(err)	Err	z3bra.org	70
i+                                                scoreboard.Fatal(err)	Err	z3bra.org	70
i                                         }	Err	z3bra.org	70
i-                                        cyboard.HighlightBoard(p.ScoreRank())	Err	z3bra.org	70
i-                                        cyboard.GenerateHTML()	Err	z3bra.org	70
i-                                        cyboard.Popup("CONGRATULATIONS", fmt.Sprintf(TOKEN_WELCOME, p.name, p.token));	Err	z3bra.org	70
i+                                        scoreboard.HighlightBoard(p.ScoreRank())	Err	z3bra.org	70
i+                                        scoreboard.GenerateHTML()	Err	z3bra.org	70
i+                                        scoreboard.Popup("CONGRATULATIONS", fmt.Sprintf(TOKEN_WELCOME, p.name, p.token));	Err	z3bra.org	70
i                                 } else {	Err	z3bra.org	70
i-                                        cyboard.Popup("NOPE", "Player name unavailable\nPlease pick another one")	Err	z3bra.org	70
i+                                        scoreboard.Popup("NOPE", "Player name unavailable\nPlease pick another one")	Err	z3bra.org	70
i                                 }	Err	z3bra.org	70
i                         }	Err	z3bra.org	70
i                 })	Err	z3bra.org	70
i 	Err	z3bra.org	70
i         v.Focus(func(p tview.Primitive) {	Err	z3bra.org	70
i-                v.SetText(fmt.Sprintf("%4d ", cyboard.player.score))	Err	z3bra.org	70
i+                v.SetText(fmt.Sprintf("%4d ", scoreboard.player.score))	Err	z3bra.org	70
i         })	Err	z3bra.org	70
i 	Err	z3bra.org	70
i         v.SetInputCapture(manipulatebox)	Err	z3bra.org	70
1diff --git a/ui.go b/ui.go	/scm/scoreboard/file/ui.go.gph	z3bra.org	70
it@@ -30,7 +30,8 @@ func BoardHeader() *tview.TextView {	Err	z3bra.org	70
i // Optionally padded with "placeholder" lines	Err	z3bra.org	70
i func RankTable(offset, limit, rank int, fill bool) *tview.Table {	Err	z3bra.org	70
i         t := tview.NewTable()	Err	z3bra.org	70
i-        players, err := db_ranked_players(cyboard.db, offset, limit)	Err	z3bra.org	70
i+	Err	z3bra.org	70
i+        players, err := db_ranked_players(scoreboard.db, offset, limit)	Err	z3bra.org	70
i         if err != nil {	Err	z3bra.org	70
i                 panic(err)	Err	z3bra.org	70
i         }	Err	z3bra.org	70
it@@ -60,10 +61,10 @@ func RankTable(offset, limit, rank int, fill bool) *tview.Table {	Err	z3bra.org	70
i                 bsize := int(math.Max(float64(BOARD_HEIGHT), float64(limit)))	Err	z3bra.org	70
i                 for i:=t.GetRowCount(); i<bsize; i++ {	Err	z3bra.org	70
i                         rankstr  := fmt.Sprintf("%4s", humanize.Ordinal(rank + i + 1))	Err	z3bra.org	70
i-                        scorestr := fmt.Sprintf("%4d", 0)	Err	z3bra.org	70
i+                        scorestr := fmt.Sprintf("%5d", 0)	Err	z3bra.org	70
i                         t.SetCell(i, 0, newcell(rankstr).SetTextColor(tcell.ColorGray))	Err	z3bra.org	70
i                         t.SetCell(i, 1, newcell("AAA").SetTextColor(tcell.ColorGray))	Err	z3bra.org	70
i-                        t.SetCell(i, 2, newcell(".......").SetTextColor(tcell.ColorGray))	Err	z3bra.org	70
i+                        t.SetCell(i, 2, newcell(".....").SetTextColor(tcell.ColorGray))	Err	z3bra.org	70
i                         t.SetCell(i, 3, newcell(scorestr).SetTextColor(tcell.ColorGray))	Err	z3bra.org	70
i                 }	Err	z3bra.org	70
i         }	Err	z3bra.org	70
.