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.
213 lines
5.8 KiB
Go
213 lines
5.8 KiB
Go
package common
|
|
|
|
import (
|
|
"encoding/json"
|
|
"errors"
|
|
"io/ioutil"
|
|
"log"
|
|
"strconv"
|
|
"strings"
|
|
)
|
|
|
|
// Site holds the basic settings which should be tweaked when setting up a site, we might move them to the settings table at some point
|
|
var Site = &site{Name: "Magical Fairy Land", Language: "english"}
|
|
|
|
// DbConfig holds the database configuration
|
|
var DbConfig = &dbConfig{Host: "localhost"}
|
|
|
|
// Config holds the more technical settings
|
|
var Config = new(config)
|
|
|
|
// Dev holds build flags and other things which should only be modified during developers or to gather additional test data
|
|
var Dev = new(devConfig)
|
|
|
|
type site struct {
|
|
ShortName string
|
|
Name string
|
|
Email string
|
|
URL string
|
|
Host string
|
|
Port string
|
|
EnableSsl bool
|
|
EnableEmails bool
|
|
HasProxy bool
|
|
Language string
|
|
|
|
MaxRequestSize int // Alias, do not modify, will be overwritten
|
|
}
|
|
|
|
type dbConfig struct {
|
|
// Production database
|
|
Adapter string
|
|
Host string
|
|
Username string
|
|
Password string
|
|
Dbname string
|
|
Port string
|
|
|
|
// Test database. Split this into a separate variable?
|
|
TestAdapter string
|
|
TestHost string
|
|
TestUsername string
|
|
TestPassword string
|
|
TestDbname string
|
|
TestPort string
|
|
}
|
|
|
|
type config struct {
|
|
SslPrivkey string
|
|
SslFullchain string
|
|
HashAlgo string // Defaults to bcrypt, and in the future, possibly something stronger
|
|
|
|
MaxRequestSizeStr string
|
|
MaxRequestSize int
|
|
UserCache string
|
|
UserCacheCapacity int
|
|
TopicCache string
|
|
TopicCacheCapacity int
|
|
|
|
SMTPServer string
|
|
SMTPUsername string
|
|
SMTPPassword string
|
|
SMTPPort string
|
|
//SMTPEnableTLS bool
|
|
|
|
DefaultPath string
|
|
DefaultGroup int // Should be a setting in the database
|
|
ActivationGroup int // Should be a setting in the database
|
|
StaffCSS string // ? - Move this into the settings table? Might be better to implement this as Group CSS
|
|
DefaultForum int // The forum posts go in by default, this used to be covered by the Uncategorised Forum, but we want to replace it with a more robust solution. Make this a setting?
|
|
MinifyTemplates bool
|
|
BuildSlugs bool // TODO: Make this a setting?
|
|
ServerCount int
|
|
|
|
Noavatar string // ? - Move this into the settings table?
|
|
ItemsPerPage int // ? - Move this into the settings table?
|
|
MaxTopicTitleLength int
|
|
MaxUsernameLength int
|
|
}
|
|
|
|
type devConfig struct {
|
|
DebugMode bool
|
|
SuperDebug bool
|
|
TemplateDebug bool
|
|
Profiling bool
|
|
TestDB bool
|
|
}
|
|
|
|
// configHolder is purely for having a big struct to unmarshal data into
|
|
type configHolder struct {
|
|
Site *site
|
|
Config *config
|
|
Database *dbConfig
|
|
Dev *devConfig
|
|
}
|
|
|
|
func LoadConfig() error {
|
|
data, err := ioutil.ReadFile("./config/config.json")
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
var config configHolder
|
|
err = json.Unmarshal(data, &config)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
Site = config.Site
|
|
Config = config.Config
|
|
DbConfig = config.Database
|
|
Dev = config.Dev
|
|
|
|
return nil
|
|
}
|
|
|
|
func ProcessConfig() (err error) {
|
|
Config.Noavatar = strings.Replace(Config.Noavatar, "{site_url}", Site.URL, -1)
|
|
Site.Host = Site.URL
|
|
if Site.Port != "80" && Site.Port != "443" {
|
|
Site.URL = strings.TrimSuffix(Site.URL, "/")
|
|
Site.URL = strings.TrimSuffix(Site.URL, "\\")
|
|
Site.URL = strings.TrimSuffix(Site.URL, ":")
|
|
Site.URL = Site.URL + ":" + Site.Port
|
|
}
|
|
if Config.DefaultPath == "" {
|
|
Config.DefaultPath = "/topics/"
|
|
}
|
|
|
|
// TODO: Bump the size of max request size up, if it's too low
|
|
Config.MaxRequestSize, err = strconv.Atoi(Config.MaxRequestSizeStr)
|
|
if err != nil {
|
|
reqSizeStr := Config.MaxRequestSizeStr
|
|
if len(reqSizeStr) < 3 {
|
|
return errors.New("Invalid unit for MaxRequestSizeStr")
|
|
}
|
|
|
|
quantity, err := strconv.Atoi(reqSizeStr[:len(reqSizeStr)-2])
|
|
if err != nil {
|
|
return errors.New("Unable to convert quantity to integer in MaxRequestSizeStr, found " + reqSizeStr[:len(reqSizeStr)-2])
|
|
}
|
|
unit := reqSizeStr[len(reqSizeStr)-2:]
|
|
|
|
// TODO: Make it a named error just in case new errors are added in here in the future
|
|
Config.MaxRequestSize, err = FriendlyUnitToBytes(quantity, unit)
|
|
if err != nil {
|
|
return errors.New("Unable to recognise unit for MaxRequestSizeStr, found " + unit)
|
|
}
|
|
}
|
|
if Dev.DebugMode {
|
|
log.Print("Set MaxRequestSize to ", Config.MaxRequestSize)
|
|
}
|
|
if Config.MaxRequestSize <= 0 {
|
|
log.Fatal("MaxRequestSize should not be zero or below")
|
|
}
|
|
Site.MaxRequestSize = Config.MaxRequestSize
|
|
|
|
// ? Find a way of making these unlimited if zero? It might rule out some optimisations, waste memory, and break layouts
|
|
if Config.MaxTopicTitleLength == 0 {
|
|
Config.MaxTopicTitleLength = 100
|
|
}
|
|
if Config.MaxUsernameLength == 0 {
|
|
Config.MaxUsernameLength = 100
|
|
}
|
|
GuestUser.Avatar = BuildAvatar(0, "")
|
|
|
|
if Config.HashAlgo != "" {
|
|
// TODO: Set the alternate hash algo, e.g. argon2
|
|
}
|
|
|
|
// We need this in here rather than verifyConfig as switchToTestDB() currently overwrites the values it verifies
|
|
if DbConfig.TestDbname == DbConfig.Dbname {
|
|
return errors.New("Your test database can't have the same name as your production database")
|
|
}
|
|
if Dev.TestDB {
|
|
SwitchToTestDB()
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func VerifyConfig() error {
|
|
if !Forums.Exists(Config.DefaultForum) {
|
|
return errors.New("Invalid default forum")
|
|
}
|
|
if Config.ServerCount < 1 {
|
|
return errors.New("You can't have less than one server")
|
|
}
|
|
if Config.MaxTopicTitleLength > 100 {
|
|
return errors.New("The max topic title length cannot be over 100 as that's unable to fit in the database row")
|
|
}
|
|
if Config.MaxUsernameLength > 100 {
|
|
return errors.New("The max username length cannot be over 100 as that's unable to fit in the database row")
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func SwitchToTestDB() {
|
|
DbConfig.Host = DbConfig.TestHost
|
|
DbConfig.Username = DbConfig.TestUsername
|
|
DbConfig.Password = DbConfig.TestPassword
|
|
DbConfig.Dbname = DbConfig.TestDbname
|
|
DbConfig.Port = DbConfig.TestPort
|
|
}
|