mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-12-24 13:09:23 -05:00
704da08fdc
* Panic don't fatal on create new logger Fixes #5854 Signed-off-by: Andrew Thornton <art27@cantab.net> * partial broken * Update the logging infrastrcture Signed-off-by: Andrew Thornton <art27@cantab.net> * Reset the skip levels for Fatal and Error Signed-off-by: Andrew Thornton <art27@cantab.net> * broken ncsa * More log.Error fixes Signed-off-by: Andrew Thornton <art27@cantab.net> * Remove nal * set log-levels to lowercase * Make console_test test all levels * switch to lowercased levels * OK now working * Fix vetting issues * Fix lint * Fix tests * change default logging to match current gitea * Improve log testing Signed-off-by: Andrew Thornton <art27@cantab.net> * reset error skip levels to 0 * Update documentation and access logger configuration * Redirect the router log back to gitea if redirect macaron log but also allow setting the log level - i.e. TRACE * Fix broken level caching * Refactor the router log * Add Router logger * Add colorizing options * Adjust router colors * Only create logger if they will be used * update app.ini.sample * rename Attribute ColorAttribute * Change from white to green for function * Set fatal/error levels * Restore initial trace logger * Fix Trace arguments in modules/auth/auth.go * Properly handle XORMLogger * Improve admin/config page * fix fmt * Add auto-compression of old logs * Update error log levels * Remove the unnecessary skip argument from Error, Fatal and Critical * Add stacktrace support * Fix tests * Remove x/sync from vendors? * Add stderr option to console logger * Use filepath.ToSlash to protect against Windows in tests * Remove prefixed underscores from names in colors.go * Remove not implemented database logger This was removed from Gogs on 4 Mar 2016 but left in the configuration since then. * Ensure that log paths are relative to ROOT_PATH * use path.Join * rename jsonConfig to logConfig * Rename "config" to "jsonConfig" to make it clearer * Requested changes * Requested changes: XormLogger * Try to color the windows terminal If successful default to colorizing the console logs * fixup * Colorize initially too * update vendor * Colorize logs on default and remove if this is not a colorizing logger * Fix documentation * fix test * Use go-isatty to detect if on windows we are on msys or cygwin * Fix spelling mistake * Add missing vendors * More changes * Rationalise the ANSI writer protection * Adjust colors on advice from @0x5c * Make Flags a comma separated list * Move to use the windows constant for ENABLE_VIRTUAL_TERMINAL_PROCESSING * Ensure matching is done on the non-colored message - to simpify EXPRESSION
120 lines
3.3 KiB
Go
120 lines
3.3 KiB
Go
// Copyright 2018 The Gitea Authors. All rights reserved.
|
|
// Use of this source code is governed by a MIT-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package models
|
|
|
|
import (
|
|
"code.gitea.io/gitea/modules/log"
|
|
"code.gitea.io/gitea/modules/util"
|
|
|
|
"github.com/tstranex/u2f"
|
|
)
|
|
|
|
// U2FRegistration represents the registration data and counter of a security key
|
|
type U2FRegistration struct {
|
|
ID int64 `xorm:"pk autoincr"`
|
|
Name string
|
|
UserID int64 `xorm:"INDEX"`
|
|
Raw []byte
|
|
Counter uint32 `xorm:"BIGINT"`
|
|
CreatedUnix util.TimeStamp `xorm:"INDEX created"`
|
|
UpdatedUnix util.TimeStamp `xorm:"INDEX updated"`
|
|
}
|
|
|
|
// TableName returns a better table name for U2FRegistration
|
|
func (reg U2FRegistration) TableName() string {
|
|
return "u2f_registration"
|
|
}
|
|
|
|
// Parse will convert the db entry U2FRegistration to an u2f.Registration struct
|
|
func (reg *U2FRegistration) Parse() (*u2f.Registration, error) {
|
|
r := new(u2f.Registration)
|
|
return r, r.UnmarshalBinary(reg.Raw)
|
|
}
|
|
|
|
func (reg *U2FRegistration) updateCounter(e Engine) error {
|
|
_, err := e.ID(reg.ID).Cols("counter").Update(reg)
|
|
return err
|
|
}
|
|
|
|
// UpdateCounter will update the database value of counter
|
|
func (reg *U2FRegistration) UpdateCounter() error {
|
|
return reg.updateCounter(x)
|
|
}
|
|
|
|
// U2FRegistrationList is a list of *U2FRegistration
|
|
type U2FRegistrationList []*U2FRegistration
|
|
|
|
// ToRegistrations will convert all U2FRegistrations to u2f.Registrations
|
|
func (list U2FRegistrationList) ToRegistrations() []u2f.Registration {
|
|
regs := make([]u2f.Registration, len(list))
|
|
for _, reg := range list {
|
|
r, err := reg.Parse()
|
|
if err != nil {
|
|
log.Fatal("parsing u2f registration: %v", err)
|
|
continue
|
|
}
|
|
regs = append(regs, *r)
|
|
}
|
|
|
|
return regs
|
|
}
|
|
|
|
func getU2FRegistrationsByUID(e Engine, uid int64) (U2FRegistrationList, error) {
|
|
regs := make(U2FRegistrationList, 0)
|
|
return regs, e.Where("user_id = ?", uid).Find(®s)
|
|
}
|
|
|
|
// GetU2FRegistrationByID returns U2F registration by id
|
|
func GetU2FRegistrationByID(id int64) (*U2FRegistration, error) {
|
|
return getU2FRegistrationByID(x, id)
|
|
}
|
|
|
|
func getU2FRegistrationByID(e Engine, id int64) (*U2FRegistration, error) {
|
|
reg := new(U2FRegistration)
|
|
if found, err := e.ID(id).Get(reg); err != nil {
|
|
return nil, err
|
|
} else if !found {
|
|
return nil, ErrU2FRegistrationNotExist{ID: id}
|
|
}
|
|
return reg, nil
|
|
}
|
|
|
|
// GetU2FRegistrationsByUID returns all U2F registrations of the given user
|
|
func GetU2FRegistrationsByUID(uid int64) (U2FRegistrationList, error) {
|
|
return getU2FRegistrationsByUID(x, uid)
|
|
}
|
|
|
|
func createRegistration(e Engine, user *User, name string, reg *u2f.Registration) (*U2FRegistration, error) {
|
|
raw, err := reg.MarshalBinary()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
r := &U2FRegistration{
|
|
UserID: user.ID,
|
|
Name: name,
|
|
Counter: 0,
|
|
Raw: raw,
|
|
}
|
|
_, err = e.InsertOne(r)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return r, nil
|
|
}
|
|
|
|
// CreateRegistration will create a new U2FRegistration from the given Registration
|
|
func CreateRegistration(user *User, name string, reg *u2f.Registration) (*U2FRegistration, error) {
|
|
return createRegistration(x, user, name, reg)
|
|
}
|
|
|
|
// DeleteRegistration will delete U2FRegistration
|
|
func DeleteRegistration(reg *U2FRegistration) error {
|
|
return deleteRegistration(x, reg)
|
|
}
|
|
|
|
func deleteRegistration(e Engine, reg *U2FRegistration) error {
|
|
_, err := e.Delete(reg)
|
|
return err
|
|
}
|