Change from asking for admin password to randomly generating one

This commit is contained in:
gmemstr 2017-12-07 10:36:52 -08:00
parent d9a6482153
commit b18279c393
4 changed files with 33 additions and 21 deletions

2
.gitignore vendored
View file

@ -24,3 +24,5 @@ vendor/
assets/config/users\.db
run\.lockfile
\.lock

View file

@ -10,7 +10,7 @@
<div class="container">
<div id="app">
<nav>
<router-link to="/publish">Publish</router-link> <router-link to="/manage">Episodes</router-link> <router-link to="/theme">Theme</router-link> <router-link to="/users">Users</router-link></nav>
<router-link to="/publish">Publish</router-link> <router-link to="/manage">Episodes</router-link> <router-link to="/theme">Theme</router-link> <router-link to="/users">Users</router-link> <button onclick="logout()">Logout</button></nav>
<h1>{{ header }}</h1>
<router-view></router-view>
</div>

View file

@ -377,3 +377,8 @@ function get(url,callback) {
xmlHttp.open("GET", url, true);
xmlHttp.send(null);
}
function logout() {
document.cookie = "POGO_SESSION=;expires=Thu, 01 Jan 1970 00:00:01 GMT";
window.location = "/";
}

View file

@ -2,21 +2,30 @@ package main
import (
"archive/zip"
"bufio"
"context"
"database/sql"
"fmt"
_ "github.com/mattn/go-sqlite3"
"golang.org/x/crypto/bcrypt"
"io"
"math/rand"
"net/http"
"os"
"path/filepath"
"strings"
"github.com/google/go-github/github"
)
func RandomString(n int) string {
var letter = []rune("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()_+-={}[]")
b := make([]rune, n)
for i := range b {
b[i] = letter[rand.Intn(len(letter))]
}
return string(b)
}
func Setup() {
defer LockFile()
// Create users SQLite3 file
@ -28,30 +37,26 @@ func Setup() {
db, err := sql.Open("sqlite3", "assets/config/users.db")
if err != nil {
fmt.Sprintf("Problem opening database file! %v", err)
fmt.Println("Problem opening database file! %v", err)
}
_, err = db.Exec("CREATE TABLE IF NOT EXISTS `users` ( `id` INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT UNIQUE, `username` TEXT UNIQUE, `hash` TEXT, `realname` TEXT, `email` TEXT, `permissions` INTEGER )")
if err != nil {
fmt.Sprintf("Problem creating database! %v", err)
fmt.Println("Problem creating database! %v", err)
}
// Insert default admin user
reader := bufio.NewReader(os.Stdin)
fmt.Print("Administrator password: ")
text, err := reader.ReadString('\n')
text = strings.Replace(text, "\n", "", -1)
if err != nil {
fmt.Sprintf("Problem reading password input! %v", err)
}
fmt.Println(text)
text := RandomString(14)
fmt.Println("Admin password: ", text)
hash, err := bcrypt.GenerateFromPassword([]byte(text), 4)
if err != nil {
fmt.Println("Error generating hash", err)
}
if bcrypt.CompareHashAndPassword(hash, []byte(text)) == nil {
fmt.Println("Password hashed")
}
_, err = db.Exec("INSERT INTO users(id,username,hash,realname,email,permissions) VALUES (0,'admin',?,'Administrator','admin@localhost',2)", hash)
_, err = db.Exec("INSERT INTO users(id,username,hash,realname,email,permissions) VALUES (0,'admin','" + string(hash) + "','Administrator','admin@localhost',2)")
if err != nil {
fmt.Sprintf("Problem creating database! %v", err)
fmt.Println("Problem creating database! %v", err)
}
defer db.Close()
@ -64,29 +69,29 @@ func Setup() {
ctx := context.Background()
res, _, err := client.GetLatestRelease(ctx, "gmemstr", "pogo")
if err != nil {
fmt.Sprintf("Problem creating database! %v", err)
fmt.Println("Problem creating database! %v", err)
}
for i := 0; i < len(res.Assets); i++ {
if res.Assets[i].GetName() == "webassets.zip" {
download := res.Assets[i]
fmt.Sprintf("Release found: %v", download.GetBrowserDownloadURL())
fmt.Println("Release found: %v", download.GetBrowserDownloadURL())
tmpfile, err := os.Create(download.GetName())
if err != nil {
fmt.Sprintf("Problem creating webassets file! %v", err)
fmt.Println("Problem creating webassets file! %v", err)
}
var j io.Reader = (*os.File)(tmpfile)
defer tmpfile.Close()
j, s, err := client.DownloadReleaseAsset(ctx, "gmemstr", "pogo", download.GetID())
if err != nil {
fmt.Sprintf("Problem downloading webassets! %v", err)
fmt.Println("Problem downloading webassets! %v", err)
}
if j == nil {
resp, err := http.Get(s)
defer resp.Body.Close()
_, err = io.Copy(tmpfile, resp.Body)
if err != nil {
fmt.Sprintf("Problem creating webassets file! %v", err)
fmt.Println("Problem creating webassets file! %v", err)
}
fmt.Println("Download complete\nUnzipping")
err = Unzip(download.GetName(), "assets/web")