mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-31 11:22:27 -05:00 
			
		
		
		
	[chore]: Bump github.com/google/uuid from 1.4.0 to 1.5.0 (#2469)
Bumps [github.com/google/uuid](https://github.com/google/uuid) from 1.4.0 to 1.5.0. - [Release notes](https://github.com/google/uuid/releases) - [Changelog](https://github.com/google/uuid/blob/master/CHANGELOG.md) - [Commits](https://github.com/google/uuid/compare/v1.4.0...v1.5.0) --- updated-dependencies: - dependency-name: github.com/google/uuid dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This commit is contained in:
		
					parent
					
						
							
								0e56867d8b
							
						
					
				
			
			
				commit
				
					
						d685e86432
					
				
			
		
					 8 changed files with 211 additions and 9 deletions
				
			
		
							
								
								
									
										2
									
								
								go.mod
									
										
									
									
									
								
							
							
						
						
									
										2
									
								
								go.mod
									
										
									
									
									
								
							|  | @ -30,7 +30,7 @@ require ( | ||||||
| 	github.com/gin-gonic/gin v1.9.1 | 	github.com/gin-gonic/gin v1.9.1 | ||||||
| 	github.com/go-fed/httpsig v1.1.0 | 	github.com/go-fed/httpsig v1.1.0 | ||||||
| 	github.com/go-playground/form/v4 v4.2.1 | 	github.com/go-playground/form/v4 v4.2.1 | ||||||
| 	github.com/google/uuid v1.4.0 | 	github.com/google/uuid v1.5.0 | ||||||
| 	github.com/gorilla/feeds v1.1.2 | 	github.com/gorilla/feeds v1.1.2 | ||||||
| 	github.com/gorilla/websocket v1.5.1 | 	github.com/gorilla/websocket v1.5.1 | ||||||
| 	github.com/h2non/filetype v1.1.3 | 	github.com/h2non/filetype v1.1.3 | ||||||
|  |  | ||||||
							
								
								
									
										4
									
								
								go.sum
									
										
									
									
									
								
							
							
						
						
									
										4
									
								
								go.sum
									
										
									
									
									
								
							|  | @ -307,8 +307,8 @@ github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26/go.mod h1:dDKJzRmX4S3 | ||||||
| github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= | github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= | ||||||
| github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= | github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= | ||||||
| github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= | github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= | ||||||
| github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4= | github.com/google/uuid v1.5.0 h1:1p67kYwdtXjb0gL0BPiP1Av9wiZPo5A8z2cWkTZ+eyU= | ||||||
| github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= | github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= | ||||||
| github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= | github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= | ||||||
| github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= | github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= | ||||||
| github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= | github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= | ||||||
|  |  | ||||||
							
								
								
									
										7
									
								
								vendor/github.com/google/uuid/CHANGELOG.md
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										7
									
								
								vendor/github.com/google/uuid/CHANGELOG.md
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -1,5 +1,12 @@ | ||||||
| # Changelog | # Changelog | ||||||
| 
 | 
 | ||||||
|  | ## [1.5.0](https://github.com/google/uuid/compare/v1.4.0...v1.5.0) (2023-12-12) | ||||||
|  | 
 | ||||||
|  | 
 | ||||||
|  | ### Features | ||||||
|  | 
 | ||||||
|  | * Validate UUID without creating new UUID ([#141](https://github.com/google/uuid/issues/141)) ([9ee7366](https://github.com/google/uuid/commit/9ee7366e66c9ad96bab89139418a713dc584ae29)) | ||||||
|  | 
 | ||||||
| ## [1.4.0](https://github.com/google/uuid/compare/v1.3.1...v1.4.0) (2023-10-26) | ## [1.4.0](https://github.com/google/uuid/compare/v1.3.1...v1.4.0) (2023-10-26) | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
							
								
								
									
										21
									
								
								vendor/github.com/google/uuid/time.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										21
									
								
								vendor/github.com/google/uuid/time.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -108,12 +108,23 @@ func setClockSequence(seq int) { | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| // Time returns the time in 100s of nanoseconds since 15 Oct 1582 encoded in | // Time returns the time in 100s of nanoseconds since 15 Oct 1582 encoded in | ||||||
| // uuid.  The time is only defined for version 1 and 2 UUIDs. | // uuid.  The time is only defined for version 1, 2, 6 and 7 UUIDs. | ||||||
| func (uuid UUID) Time() Time { | func (uuid UUID) Time() Time { | ||||||
| 	time := int64(binary.BigEndian.Uint32(uuid[0:4])) | 	var t Time | ||||||
| 	time |= int64(binary.BigEndian.Uint16(uuid[4:6])) << 32 | 	switch uuid.Version() { | ||||||
| 	time |= int64(binary.BigEndian.Uint16(uuid[6:8])&0xfff) << 48 | 	case 6: | ||||||
| 	return Time(time) | 		time := binary.BigEndian.Uint64(uuid[:8]) // Ignore uuid[6] version b0110 | ||||||
|  | 		t = Time(time) | ||||||
|  | 	case 7: | ||||||
|  | 		time := binary.BigEndian.Uint64(uuid[:8]) | ||||||
|  | 		t = Time((time>>16)*10000 + g1582ns100) | ||||||
|  | 	default: // forward compatible | ||||||
|  | 		time := int64(binary.BigEndian.Uint32(uuid[0:4])) | ||||||
|  | 		time |= int64(binary.BigEndian.Uint16(uuid[4:6])) << 32 | ||||||
|  | 		time |= int64(binary.BigEndian.Uint16(uuid[6:8])&0xfff) << 48 | ||||||
|  | 		t = Time(time) | ||||||
|  | 	} | ||||||
|  | 	return t | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| // ClockSequence returns the clock sequence encoded in uuid. | // ClockSequence returns the clock sequence encoded in uuid. | ||||||
|  |  | ||||||
							
								
								
									
										53
									
								
								vendor/github.com/google/uuid/uuid.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										53
									
								
								vendor/github.com/google/uuid/uuid.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -186,6 +186,59 @@ func Must(uuid UUID, err error) UUID { | ||||||
| 	return uuid | 	return uuid | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  | // Validate returns an error if s is not a properly formatted UUID in one of the following formats: | ||||||
|  | //   xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx | ||||||
|  | //   urn:uuid:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx | ||||||
|  | //   xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx | ||||||
|  | //   {xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx} | ||||||
|  | // It returns an error if the format is invalid, otherwise nil. | ||||||
|  | func Validate(s string) error { | ||||||
|  | 	switch len(s) { | ||||||
|  | 	// Standard UUID format | ||||||
|  | 	case 36: | ||||||
|  | 
 | ||||||
|  | 	// UUID with "urn:uuid:" prefix | ||||||
|  | 	case 36 + 9: | ||||||
|  | 		if !strings.EqualFold(s[:9], "urn:uuid:") { | ||||||
|  | 			return fmt.Errorf("invalid urn prefix: %q", s[:9]) | ||||||
|  | 		} | ||||||
|  | 		s = s[9:] | ||||||
|  | 
 | ||||||
|  | 	// UUID enclosed in braces | ||||||
|  | 	case 36 + 2: | ||||||
|  | 		if s[0] != '{' || s[len(s)-1] != '}' { | ||||||
|  | 			return fmt.Errorf("invalid bracketed UUID format") | ||||||
|  | 		} | ||||||
|  | 		s = s[1 : len(s)-1] | ||||||
|  | 
 | ||||||
|  | 	// UUID without hyphens | ||||||
|  | 	case 32: | ||||||
|  | 		for i := 0; i < len(s); i += 2 { | ||||||
|  | 			_, ok := xtob(s[i], s[i+1]) | ||||||
|  | 			if !ok { | ||||||
|  | 				return errors.New("invalid UUID format") | ||||||
|  | 			} | ||||||
|  | 		} | ||||||
|  | 
 | ||||||
|  | 	default: | ||||||
|  | 		return invalidLengthError{len(s)} | ||||||
|  | 	} | ||||||
|  | 
 | ||||||
|  | 	// Check for standard UUID format | ||||||
|  | 	if len(s) == 36 { | ||||||
|  | 		if s[8] != '-' || s[13] != '-' || s[18] != '-' || s[23] != '-' { | ||||||
|  | 			return errors.New("invalid UUID format") | ||||||
|  | 		} | ||||||
|  | 		for _, x := range []int{0, 2, 4, 6, 9, 11, 14, 16, 19, 21, 24, 26, 28, 30, 32, 34} { | ||||||
|  | 			if _, ok := xtob(s[x], s[x+1]); !ok { | ||||||
|  | 				return errors.New("invalid UUID format") | ||||||
|  | 			} | ||||||
|  | 		} | ||||||
|  | 	} | ||||||
|  | 
 | ||||||
|  | 	return nil | ||||||
|  | } | ||||||
|  | 
 | ||||||
| // String returns the string form of uuid, xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx | // String returns the string form of uuid, xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx | ||||||
| // , or "" if uuid is invalid. | // , or "" if uuid is invalid. | ||||||
| func (uuid UUID) String() string { | func (uuid UUID) String() string { | ||||||
|  |  | ||||||
							
								
								
									
										56
									
								
								vendor/github.com/google/uuid/version6.go
									
										
									
										generated
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										56
									
								
								vendor/github.com/google/uuid/version6.go
									
										
									
										generated
									
									
										vendored
									
									
										Normal file
									
								
							|  | @ -0,0 +1,56 @@ | ||||||
|  | // Copyright 2023 Google Inc.  All rights reserved. | ||||||
|  | // Use of this source code is governed by a BSD-style | ||||||
|  | // license that can be found in the LICENSE file. | ||||||
|  | 
 | ||||||
|  | package uuid | ||||||
|  | 
 | ||||||
|  | import "encoding/binary" | ||||||
|  | 
 | ||||||
|  | // UUID version 6 is a field-compatible version of UUIDv1, reordered for improved DB locality. | ||||||
|  | // It is expected that UUIDv6 will primarily be used in contexts where there are existing v1 UUIDs. | ||||||
|  | // Systems that do not involve legacy UUIDv1 SHOULD consider using UUIDv7 instead. | ||||||
|  | // | ||||||
|  | // see https://datatracker.ietf.org/doc/html/draft-peabody-dispatch-new-uuid-format-03#uuidv6 | ||||||
|  | // | ||||||
|  | // NewV6 returns a Version 6 UUID based on the current NodeID and clock | ||||||
|  | // sequence, and the current time. If the NodeID has not been set by SetNodeID | ||||||
|  | // or SetNodeInterface then it will be set automatically. If the NodeID cannot | ||||||
|  | // be set NewV6 set NodeID is random bits automatically . If clock sequence has not been set by | ||||||
|  | // SetClockSequence then it will be set automatically. If GetTime fails to | ||||||
|  | // return the current NewV6 returns Nil and an error. | ||||||
|  | func NewV6() (UUID, error) { | ||||||
|  | 	var uuid UUID | ||||||
|  | 	now, seq, err := GetTime() | ||||||
|  | 	if err != nil { | ||||||
|  | 		return uuid, err | ||||||
|  | 	} | ||||||
|  | 
 | ||||||
|  | 	/* | ||||||
|  | 	    0                   1                   2                   3 | ||||||
|  | 	    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 | ||||||
|  | 	   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | ||||||
|  | 	   |                           time_high                           | | ||||||
|  | 	   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | ||||||
|  | 	   |           time_mid            |      time_low_and_version     | | ||||||
|  | 	   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | ||||||
|  | 	   |clk_seq_hi_res |  clk_seq_low  |         node (0-1)            | | ||||||
|  | 	   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | ||||||
|  | 	   |                         node (2-5)                            | | ||||||
|  | 	   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | ||||||
|  | 	*/ | ||||||
|  | 
 | ||||||
|  | 	binary.BigEndian.PutUint64(uuid[0:], uint64(now)) | ||||||
|  | 	binary.BigEndian.PutUint16(uuid[8:], seq) | ||||||
|  | 
 | ||||||
|  | 	uuid[6] = 0x60 | (uuid[6] & 0x0F) | ||||||
|  | 	uuid[8] = 0x80 | (uuid[8] & 0x3F) | ||||||
|  | 
 | ||||||
|  | 	nodeMu.Lock() | ||||||
|  | 	if nodeID == zeroID { | ||||||
|  | 		setNodeInterface("") | ||||||
|  | 	} | ||||||
|  | 	copy(uuid[10:], nodeID[:]) | ||||||
|  | 	nodeMu.Unlock() | ||||||
|  | 
 | ||||||
|  | 	return uuid, nil | ||||||
|  | } | ||||||
							
								
								
									
										75
									
								
								vendor/github.com/google/uuid/version7.go
									
										
									
										generated
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										75
									
								
								vendor/github.com/google/uuid/version7.go
									
										
									
										generated
									
									
										vendored
									
									
										Normal file
									
								
							|  | @ -0,0 +1,75 @@ | ||||||
|  | // Copyright 2023 Google Inc.  All rights reserved. | ||||||
|  | // Use of this source code is governed by a BSD-style | ||||||
|  | // license that can be found in the LICENSE file. | ||||||
|  | 
 | ||||||
|  | package uuid | ||||||
|  | 
 | ||||||
|  | import ( | ||||||
|  | 	"io" | ||||||
|  | ) | ||||||
|  | 
 | ||||||
|  | // UUID version 7 features a time-ordered value field derived from the widely | ||||||
|  | // implemented and well known Unix Epoch timestamp source, | ||||||
|  | // the number of milliseconds seconds since midnight 1 Jan 1970 UTC, leap seconds excluded. | ||||||
|  | // As well as improved entropy characteristics over versions 1 or 6. | ||||||
|  | // | ||||||
|  | // see https://datatracker.ietf.org/doc/html/draft-peabody-dispatch-new-uuid-format-03#name-uuid-version-7 | ||||||
|  | // | ||||||
|  | // Implementations SHOULD utilize UUID version 7 over UUID version 1 and 6 if possible. | ||||||
|  | // | ||||||
|  | // NewV7 returns a Version 7 UUID based on the current time(Unix Epoch). | ||||||
|  | // Uses the randomness pool if it was enabled with EnableRandPool. | ||||||
|  | // On error, NewV7 returns Nil and an error | ||||||
|  | func NewV7() (UUID, error) { | ||||||
|  | 	uuid, err := NewRandom() | ||||||
|  | 	if err != nil { | ||||||
|  | 		return uuid, err | ||||||
|  | 	} | ||||||
|  | 	makeV7(uuid[:]) | ||||||
|  | 	return uuid, nil | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | // NewV7FromReader returns a Version 7 UUID based on the current time(Unix Epoch). | ||||||
|  | // it use NewRandomFromReader fill random bits. | ||||||
|  | // On error, NewV7FromReader returns Nil and an error. | ||||||
|  | func NewV7FromReader(r io.Reader) (UUID, error) { | ||||||
|  | 	uuid, err := NewRandomFromReader(r) | ||||||
|  | 	if err != nil { | ||||||
|  | 		return uuid, err | ||||||
|  | 	} | ||||||
|  | 
 | ||||||
|  | 	makeV7(uuid[:]) | ||||||
|  | 	return uuid, nil | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | // makeV7 fill 48 bits time (uuid[0] - uuid[5]), set version b0111 (uuid[6]) | ||||||
|  | // uuid[8] already has the right version number (Variant is 10) | ||||||
|  | // see function  NewV7 and NewV7FromReader | ||||||
|  | func makeV7(uuid []byte) { | ||||||
|  | 	/* | ||||||
|  | 		 0                   1                   2                   3 | ||||||
|  | 		 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 | ||||||
|  | 		+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | ||||||
|  | 		|                           unix_ts_ms                          | | ||||||
|  | 		+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | ||||||
|  | 		|          unix_ts_ms           |  ver  |       rand_a          | | ||||||
|  | 		+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | ||||||
|  | 		|var|                        rand_b                             | | ||||||
|  | 		+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | ||||||
|  | 		|                            rand_b                             | | ||||||
|  | 		+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | ||||||
|  | 	*/ | ||||||
|  | 	_ = uuid[15] // bounds check | ||||||
|  | 
 | ||||||
|  | 	t := timeNow().UnixMilli() | ||||||
|  | 
 | ||||||
|  | 	uuid[0] = byte(t >> 40) | ||||||
|  | 	uuid[1] = byte(t >> 32) | ||||||
|  | 	uuid[2] = byte(t >> 24) | ||||||
|  | 	uuid[3] = byte(t >> 16) | ||||||
|  | 	uuid[4] = byte(t >> 8) | ||||||
|  | 	uuid[5] = byte(t) | ||||||
|  | 
 | ||||||
|  | 	uuid[6] = 0x70 | (uuid[6] & 0x0F) | ||||||
|  | 	// uuid[8] has already has right version | ||||||
|  | } | ||||||
							
								
								
									
										2
									
								
								vendor/modules.txt
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								vendor/modules.txt
									
										
									
									
										vendored
									
									
								
							|  | @ -269,7 +269,7 @@ github.com/golang/protobuf/ptypes | ||||||
| github.com/golang/protobuf/ptypes/any | github.com/golang/protobuf/ptypes/any | ||||||
| github.com/golang/protobuf/ptypes/duration | github.com/golang/protobuf/ptypes/duration | ||||||
| github.com/golang/protobuf/ptypes/timestamp | github.com/golang/protobuf/ptypes/timestamp | ||||||
| # github.com/google/uuid v1.4.0 | # github.com/google/uuid v1.5.0 | ||||||
| ## explicit | ## explicit | ||||||
| github.com/google/uuid | github.com/google/uuid | ||||||
| # github.com/gorilla/context v1.1.1 | # github.com/gorilla/context v1.1.1 | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue