f8f46b3c48
Added the Account Dashboard and merged a few account views into it. BREAKING CHANGE: We now use config/config.json instead of config/config.go, be sure to setup one of these files, you can config_default.json as an example of what a config.json should look like. If you don't have an existing installation, you can just rely on the installer to do this for you. CSS Changes (does not include Nox Theme): Sidebar should no longer show up in the account manager in some odd situations or themes. Made a few CSS rules more generic. Forms have a new look in Cosora now. Config Changes: Removed the DefaultRoute config field. Added the DefaultPath config field. Added the MaxRequestSizeStr config field to make it easier for users to input custom max request sizes without having to use a calculator or figure out how many bytes there are in a megabyte. Removed the CacheTopicUser config field. Added the UserCache config field. Added the TopicCache config field Phrases: Removed ten english phrases. Added 21 english phrases. Changed eleven english phrases. Removed some duplicate indices in the english phrase pack. Removed some old benchmark code. Tweaked some things to make the linter happy. Added comments for all the MemoryUserCache and MemoryTopicCache methods. Added a comment for the null caches, consult the other caches for further information on the methods. Added a client-side check to make sure the user doesn't upload too much data in a single post. The server already did this, but it might be a while before feedback arrives from it. Simplified a lot of the control panel route code with the buildBasePage function. Renamed /user/edit/critical/ to /user/edit/password/ Renamed /user/edit/critical/submit/ to /user/edit/password/submit/ Made some small improvements to SEO with a couple of meta tags. Renamed some of the control panel templates so that they use _ instead of -. Fixed a bug where notices were being moved to the wrong place in some areas in Cosora. Added the writeJsonError function to help abstract writing json errors. Moved routePanelUsers to panel.Users Moved routePanelUsersEdit to panel.UsersEdit Moved routePanelUsersEditSubmit to panel.UsersEditSubmit Renamed routes.AccountEditCritical to routes.AccountEditPassword Renamed routes.AccountEditCriticalSubmit to routes.AccountEditPasswordSubmit Removed the routes.AccountEditAvatar and routes.AccountEditUsername routes. Fixed a data race in MemoryTopicCache.Add which could lead to the capacity limit being bypassed. Tweaked MemoryTopicCache.AddUnsafe under the assumption that it's not going to be safe anyway, but we might as-well try in case this call is properly synchronised. Fixed a data race in MemoryTopicCache.Remove which could lead to the length counter being decremented twice. Tweaked the behaviour of MemoryTopicCache.RemoveUnsafe to mirror that of Remove. Fixed a data race in MemoryUserCache.Add which could lead to the capacity limit being bypassed. User can no longer change their usernames to blank. Made a lot of progress on the Nox theme. Added modified FA5 SVGs as a dependency for Nox. Be sure to run the patcher or update script and don't forget to create a customised config/config.json file.
68 lines
2.0 KiB
Go
68 lines
2.0 KiB
Go
// Google Authenticator 2FA
|
||
// Borrowed from https://github.com/tilaklodha/google-authenticator, as we can't import it as a library as it's in package main
|
||
package gauth
|
||
|
||
import (
|
||
"bytes"
|
||
"crypto/hmac"
|
||
"crypto/sha1"
|
||
"encoding/base32"
|
||
"encoding/binary"
|
||
"strconv"
|
||
"strings"
|
||
"time"
|
||
)
|
||
|
||
// Append extra 0s if the length of otp is less than 6
|
||
// If otp is "1234", it will return it as "001234"
|
||
func prefix0(otp string) string {
|
||
if len(otp) == 6 {
|
||
return otp
|
||
}
|
||
for i := (6 - len(otp)); i > 0; i-- {
|
||
otp = "0" + otp
|
||
}
|
||
return otp
|
||
}
|
||
|
||
func GetHOTPToken(secret string, interval int64) (string, error) {
|
||
secret = strings.Replace(secret, " ", "", -1)
|
||
|
||
// Converts secret to base32 Encoding. Base32 encoding desires a 32-character subset of the twenty-six letters A–Z and ten digits 0–9
|
||
key, err := base32.StdEncoding.DecodeString(strings.ToUpper(secret))
|
||
if err != nil {
|
||
return "", err
|
||
}
|
||
bs := make([]byte, 8)
|
||
binary.BigEndian.PutUint64(bs, uint64(interval))
|
||
|
||
// Signing the value using HMAC-SHA1 Algorithm
|
||
hash := hmac.New(sha1.New, key)
|
||
hash.Write(bs)
|
||
h := hash.Sum(nil)
|
||
|
||
// We're going to use a subset of the generated hash.
|
||
// Using the last nibble (half-byte) to choose the index to start from.
|
||
// This number is always appropriate as it's maximum decimal 15, the hash will have the maximum index 19 (20 bytes of SHA1) and we need 4 bytes.
|
||
o := (h[19] & 15)
|
||
|
||
var header uint32
|
||
// Get 32 bit chunk from hash starting at the o
|
||
r := bytes.NewReader(h[o : o+4])
|
||
err = binary.Read(r, binary.BigEndian, &header)
|
||
if err != nil {
|
||
return "", err
|
||
}
|
||
|
||
// Ignore most significant bits as per RFC 4226.
|
||
// Takes division from one million to generate a remainder less than < 7 digits
|
||
h12 := (int(header) & 0x7fffffff) % 1000000
|
||
return prefix0(strconv.Itoa(int(h12))), nil
|
||
}
|
||
|
||
func GetTOTPToken(secret string) (string, error) {
|
||
// The TOTP token is just a HOTP token seeded with every 30 seconds.
|
||
interval := time.Now().Unix() / 30
|
||
return GetHOTPToken(secret, interval)
|
||
}
|