Remove cans feature; harden pw_/tok_ cookie flags (pre-release fixes) (#307)
This commit was merged in pull request #307.
This commit is contained in:
1 parent
651bc0cb86
commit
c02550050f
20 files changed
+176
-1367
No files matched your search
@@ -10,7 +10,7 @@ var slugRE = regexp.MustCompile(`^[a-zA-Z0-9][a-zA-Z0-9-_]{0,63}$`)
|
||||
|
||||
// reserved words that would collide with routes
|
||||
var reservedSlugs = map[string]bool{
|
||||
"api": true, "raw": true, "can": true, "cans": true, "public": true,
|
||||
"api": true, "raw": true, "public": true,
|
||||
"history": true, "static": true, "assets": true, "favicon.ico": true,
|
||||
"new": true, "login": true, "logout": true, "admin": true, "settings": true,
|
||||
"mine": true, "saved": true, "unlock": true, "guess": true, "f": true,
|
||||
@@ -36,12 +36,5 @@ func (s *Store) SlugTaken(slug string) (bool, error) {
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
if n > 0 {
|
||||
return true, nil
|
||||
}
|
||||
err = s.db.QueryRow(`SELECT COUNT(*) FROM paste_cans WHERE id = ?`, slug).Scan(&n)
|
||||
if err != nil {
|
||||
return false, err
|
||||
}
|
||||
return n > 0, nil
|
||||
}
|
||||
Reference in new issue
Block a user