From f5cbf4cadc7c2ab89beb2ff260e75311b0ae8b98 Mon Sep 17 00:00:00 2001 From: Ted Unangst Date: Fri, 19 Apr 2019 11:32:01 -0400 Subject: [PATCH] use two more bytes for xid, but don't bother looking for dupes. 102 bits ought to be enough for anyone --- fun.go | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/fun.go b/fun.go index 8986ff9..be6e23a 100644 --- a/fun.go +++ b/fun.go @@ -18,7 +18,6 @@ package main import ( "crypto/rand" "crypto/rsa" - "database/sql" "fmt" "html" "html/template" @@ -77,31 +76,13 @@ func reverbolate(honks []*Honk) { func xfiltrate() string { letters := "BCDFGHJKLMNPQRSTVWXYZbcdfghjklmnpqrstvwxyz1234567891234567891234" - db := opendatabase() for { - var x int64 - var b [16]byte + var b [18]byte rand.Read(b[:]) for i, c := range b { b[i] = letters[c&63] } s := string(b[:]) - r := db.QueryRow("select honkid from honks where xid = ?", s) - err := r.Scan(&x) - if err == nil { - continue - } - if err != sql.ErrNoRows { - log.Panicf("err picking xid: %s", err) - } - r = db.QueryRow("select fileid from files where xid = ?", s) - err = r.Scan(&x) - if err == nil { - continue - } - if err != sql.ErrNoRows { - log.Panicf("err picking xid: %s", err) - } return s } }