mirror of
				https://github.com/go-gitea/gitea
				synced 2025-10-31 03:18:24 +00:00 
			
		
		
		
	- The current implementation of `RandomString` doesn't give you a most-possible unique randomness. It gives you 6*`length` instead of the possible 8*`length` bits(or as `length`x bytes) randomness. This is because `RandomString` is being limited to a max value of 63, this in order to represent the random byte as a letter/digit. - The recommendation of pbkdf2 is to use 64+ bit salt, which the `RandomString` doesn't give with a length of 10, instead of increasing 10 to a higher number, this patch adds a new function called `RandomBytes` which does give you the guarentee of 8*`length` randomness and thus corresponding of `length`x bytes randomness. - Use hexadecimal to store the bytes value in the database, as mentioned, it doesn't play nice in order to convert it to a string. This will always be a length of 32(with `length` being 16). - When we detect on `Authenticate`(source: db) that a user has the old format of salt, re-hash the password such that the user will have it's password hashed with increased salt. Thanks to @zeripath for working out the rouge edges from my first commit 😄. Co-authored-by: lafriks <lauris@nix.lv> Co-authored-by: zeripath <art27@cantab.net>
		
			
				
	
	
		
			173 lines
		
	
	
		
			3.9 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			173 lines
		
	
	
		
			3.9 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| // Copyright 2017 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 util
 | |
| 
 | |
| import (
 | |
| 	"bytes"
 | |
| 	"crypto/rand"
 | |
| 	"errors"
 | |
| 	"math/big"
 | |
| 	"strconv"
 | |
| 	"strings"
 | |
| )
 | |
| 
 | |
| // OptionalBool a boolean that can be "null"
 | |
| type OptionalBool byte
 | |
| 
 | |
| const (
 | |
| 	// OptionalBoolNone a "null" boolean value
 | |
| 	OptionalBoolNone OptionalBool = iota
 | |
| 	// OptionalBoolTrue a "true" boolean value
 | |
| 	OptionalBoolTrue
 | |
| 	// OptionalBoolFalse a "false" boolean value
 | |
| 	OptionalBoolFalse
 | |
| )
 | |
| 
 | |
| // IsTrue return true if equal to OptionalBoolTrue
 | |
| func (o OptionalBool) IsTrue() bool {
 | |
| 	return o == OptionalBoolTrue
 | |
| }
 | |
| 
 | |
| // IsFalse return true if equal to OptionalBoolFalse
 | |
| func (o OptionalBool) IsFalse() bool {
 | |
| 	return o == OptionalBoolFalse
 | |
| }
 | |
| 
 | |
| // IsNone return true if equal to OptionalBoolNone
 | |
| func (o OptionalBool) IsNone() bool {
 | |
| 	return o == OptionalBoolNone
 | |
| }
 | |
| 
 | |
| // OptionalBoolOf get the corresponding OptionalBool of a bool
 | |
| func OptionalBoolOf(b bool) OptionalBool {
 | |
| 	if b {
 | |
| 		return OptionalBoolTrue
 | |
| 	}
 | |
| 	return OptionalBoolFalse
 | |
| }
 | |
| 
 | |
| // OptionalBoolParse get the corresponding OptionalBool of a string using strconv.ParseBool
 | |
| func OptionalBoolParse(s string) OptionalBool {
 | |
| 	b, e := strconv.ParseBool(s)
 | |
| 	if e != nil {
 | |
| 		return OptionalBoolNone
 | |
| 	}
 | |
| 	return OptionalBoolOf(b)
 | |
| }
 | |
| 
 | |
| // Max max of two ints
 | |
| func Max(a, b int) int {
 | |
| 	if a < b {
 | |
| 		return b
 | |
| 	}
 | |
| 	return a
 | |
| }
 | |
| 
 | |
| // Min min of two ints
 | |
| func Min(a, b int) int {
 | |
| 	if a > b {
 | |
| 		return b
 | |
| 	}
 | |
| 	return a
 | |
| }
 | |
| 
 | |
| // IsEmptyString checks if the provided string is empty
 | |
| func IsEmptyString(s string) bool {
 | |
| 	return len(strings.TrimSpace(s)) == 0
 | |
| }
 | |
| 
 | |
| // NormalizeEOL will convert Windows (CRLF) and Mac (CR) EOLs to UNIX (LF)
 | |
| func NormalizeEOL(input []byte) []byte {
 | |
| 	var right, left, pos int
 | |
| 	if right = bytes.IndexByte(input, '\r'); right == -1 {
 | |
| 		return input
 | |
| 	}
 | |
| 	length := len(input)
 | |
| 	tmp := make([]byte, length)
 | |
| 
 | |
| 	// We know that left < length because otherwise right would be -1 from IndexByte.
 | |
| 	copy(tmp[pos:pos+right], input[left:left+right])
 | |
| 	pos += right
 | |
| 	tmp[pos] = '\n'
 | |
| 	left += right + 1
 | |
| 	pos++
 | |
| 
 | |
| 	for left < length {
 | |
| 		if input[left] == '\n' {
 | |
| 			left++
 | |
| 		}
 | |
| 
 | |
| 		right = bytes.IndexByte(input[left:], '\r')
 | |
| 		if right == -1 {
 | |
| 			copy(tmp[pos:], input[left:])
 | |
| 			pos += length - left
 | |
| 			break
 | |
| 		}
 | |
| 		copy(tmp[pos:pos+right], input[left:left+right])
 | |
| 		pos += right
 | |
| 		tmp[pos] = '\n'
 | |
| 		left += right + 1
 | |
| 		pos++
 | |
| 	}
 | |
| 	return tmp[:pos]
 | |
| }
 | |
| 
 | |
| // MergeInto merges pairs of values into a "dict"
 | |
| func MergeInto(dict map[string]interface{}, values ...interface{}) (map[string]interface{}, error) {
 | |
| 	for i := 0; i < len(values); i++ {
 | |
| 		switch key := values[i].(type) {
 | |
| 		case string:
 | |
| 			i++
 | |
| 			if i == len(values) {
 | |
| 				return nil, errors.New("specify the key for non array values")
 | |
| 			}
 | |
| 			dict[key] = values[i]
 | |
| 		case map[string]interface{}:
 | |
| 			m := values[i].(map[string]interface{})
 | |
| 			for i, v := range m {
 | |
| 				dict[i] = v
 | |
| 			}
 | |
| 		default:
 | |
| 			return nil, errors.New("dict values must be maps")
 | |
| 		}
 | |
| 	}
 | |
| 
 | |
| 	return dict, nil
 | |
| }
 | |
| 
 | |
| // RandomInt returns a random integer between 0 and limit, inclusive
 | |
| func RandomInt(limit int64) (int64, error) {
 | |
| 	rInt, err := rand.Int(rand.Reader, big.NewInt(limit))
 | |
| 	if err != nil {
 | |
| 		return 0, err
 | |
| 	}
 | |
| 	return rInt.Int64(), nil
 | |
| }
 | |
| 
 | |
| const letters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 | |
| 
 | |
| // RandomString generates a random alphanumerical string
 | |
| func RandomString(length int64) (string, error) {
 | |
| 	bytes := make([]byte, length)
 | |
| 	limit := int64(len(letters))
 | |
| 	for i := range bytes {
 | |
| 		num, err := RandomInt(limit)
 | |
| 		if err != nil {
 | |
| 			return "", err
 | |
| 		}
 | |
| 		bytes[i] = letters[num]
 | |
| 	}
 | |
| 	return string(bytes), nil
 | |
| }
 | |
| 
 | |
| // RandomBytes generates `length` bytes
 | |
| // This differs from RandomString, as RandomString is limits each byte to have
 | |
| // a maximum value of 63 instead of 255(max byte size)
 | |
| func RandomBytes(length int64) ([]byte, error) {
 | |
| 	bytes := make([]byte, length)
 | |
| 	_, err := rand.Read(bytes)
 | |
| 	return bytes, err
 | |
| }
 |