commit 7aadab3c0d2b758d33549bb91690c005a82183c3 · veryroundbird.house/core

+1 -1

appview/state/pull.go

···

       122
       122
        
       

     

       123
       123
        
       	secret, err := db.GetRegistrationKey(s.db, f.Knot)

     

       124
       124
        
       	if err != nil {

     

       125
       125
       -
       		log.Printf("failed to get registration key: %w", err)

     

       125
       125
       +
       		log.Printf("failed to get registration key: %v", err)

     

       126
       126
        
       		return types.MergeCheckResponse{

     

       127
       127
        
       			Error: "failed to check merge status: this knot is unregistered",

     

       128
       128
        
       		}

+64

appview/state/router.go

···

       2
       2
        
       

     

       3
       3
        
       import (

     

       4
       4
        
       	"net/http"

     

       5
       5
       +
       	"regexp"

     

       5
       6
        
       	"strings"

     

       6
       7
        
       

     

       7
       8
        
       	"github.com/go-chi/chi/v5"

     
···

       15
       16
        
       		if strings.HasPrefix(pat, "did:") || strings.HasPrefix(pat, "@") {

     

       16
       17
        
       			s.UserRouter().ServeHTTP(w, r)

     

       17
       18
        
       		} else {

     

       19
       19
       +
       			// Check if the first path element is a valid handle without '@' or a flattened DID

     

       20
       20
       +
       			pathParts := strings.SplitN(pat, "/", 2)

     

       21
       21
       +
       			if len(pathParts) > 0 {

     

       22
       22
       +
       				if isHandleNoAt(pathParts[0]) {

     

       23
       23
       +
       					// Redirect to the same path but with '@' prefixed to the handle

     

       24
       24
       +
       					redirectPath := "@" + pat

     

       25
       25
       +
       					http.Redirect(w, r, "/"+redirectPath, http.StatusFound)

     

       26
       26
       +
       					return

     

       27
       27
       +
       				} else if isFlattenedDid(pathParts[0]) {

     

       28
       28
       +
       					// Redirect to the unflattened DID version

     

       29
       29
       +
       					unflattenedDid := unflattenDid(pathParts[0])

     

       30
       30
       +
       					var redirectPath string

     

       31
       31
       +
       					if len(pathParts) > 1 {

     

       32
       32
       +
       						redirectPath = unflattenedDid + "/" + pathParts[1]

     

       33
       33
       +
       					} else {

     

       34
       34
       +
       						redirectPath = unflattenedDid

     

       35
       35
       +
       					}

     

       36
       36
       +
       					http.Redirect(w, r, "/"+redirectPath, http.StatusFound)

     

       37
       37
       +
       					return

     

       38
       38
       +
       				}

     

       39
       39
       +
       			}

     

       18
       40
        
       			s.StandardRouter().ServeHTTP(w, r)

     

       19
       41
        
       		}

     

       20
       42
        
       	})

     

       21
       43
        
       

     

       22
       44
        
       	return router

     

       45
       45
       +
       }

     

       46
       46
       +
       

     

       47
       47
       +
       func isHandleNoAt(s string) bool {

     

       48
       48
       +
       	// ref: https://atproto.com/specs/handle

     

       49
       49
       +
       	re := regexp.MustCompile(`^([a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?$`)

     

       50
       50
       +
       	return re.MatchString(s)

     

       51
       51
       +
       }

     

       52
       52
       +
       

     

       53
       53
       +
       func unflattenDid(s string) string {

     

       54
       54
       +
       	if !isFlattenedDid(s) {

     

       55
       55
       +
       		return s

     

       56
       56
       +
       	}

     

       57
       57
       +
       

     

       58
       58
       +
       	parts := strings.SplitN(s[4:], "-", 2) // Skip "did-" prefix and split on first "-"

     

       59
       59
       +
       	if len(parts) != 2 {

     

       60
       60
       +
       		return s

     

       61
       61
       +
       	}

     

       62
       62
       +
       

     

       63
       63
       +
       	return "did:" + parts[0] + ":" + parts[1]

     

       64
       64
       +
       }

     

       65
       65
       +
       

     

       66
       66
       +
       // isFlattenedDid checks if the given string is a flattened DID.

     

       67
       67
       +
       // A flattened DID is a DID with the :s swapped to -s to satisfy certain

     

       68
       68
       +
       // application requirements, such as Go module naming conventions.

     

       69
       69
       +
       func isFlattenedDid(s string) bool {

     

       70
       70
       +
       	// Check if the string starts with "did-"

     

       71
       71
       +
       	if !strings.HasPrefix(s, "did-") {

     

       72
       72
       +
       		return false

     

       73
       73
       +
       	}

     

       74
       74
       +
       

     

       75
       75
       +
       	// Split the string to extract method and identifier

     

       76
       76
       +
       	parts := strings.SplitN(s[4:], "-", 2) // Skip "did-" prefix and split on first "-"

     

       77
       77
       +
       	if len(parts) != 2 {

     

       78
       78
       +
       		return false

     

       79
       79
       +
       	}

     

       80
       80
       +
       

     

       81
       81
       +
       	// Reconstruct as a standard DID format

     

       82
       82
       +
       	// Example: "did-plc-xyz-abc" becomes "did:plc:xyz-abc"

     

       83
       83
       +
       	reconstructed := "did:" + parts[0] + ":" + parts[1]

     

       84
       84
       +
       	re := regexp.MustCompile(`^did:[a-z]+:[a-zA-Z0-9._:%-]*[a-zA-Z0-9._-]$`)

     

       85
       85
       +
       

     

       86
       86
       +
       	return re.MatchString(reconstructed)

     

       23
       87
        
       }

     

       24
       88
        
       

     

       25
       89
        
       func (s *State) UserRouter() http.Handler {

+114

appview/state/router_test.go

···

       1
       1
       +
       package state

     

       2
       2
       +
       

     

       3
       3
       +
       import "testing"

     

       4
       4
       +
       

     

       5
       5
       +
       func TestUnflattenDid(t *testing.T) {

     

       6
       6
       +
       	unflattenedMap := map[string]string{

     

       7
       7
       +
       		"did-plc-abcdefghijklmnopqrstuvwxyz":                       "did:plc:abcdefghijklmnopqrstuvwxyz",

     

       8
       8
       +
       		"did-plc-1234567890":                                       "did:plc:1234567890",

     

       9
       9
       +
       		"did-key-z6MkhaXgBZDvotDkL5257faiztiGiC2QtKLGpbnnEGta2doK": "did:key:z6MkhaXgBZDvotDkL5257faiztiGiC2QtKLGpbnnEGta2doK",

     

       10
       10
       +
       		"did-plc-abcdefghi-jklmnopqr-stuvwxyz":                     "did:plc:abcdefghi-jklmnopqr-stuvwxyz",

     

       11
       11
       +
       		"plc-abcdefghijklmnopqrstuvwxyz":                           "plc-abcdefghijklmnopqrstuvwxyz",

     

       12
       12
       +
       		"didplc-abcdefghijklmnopqrstuvwxyz":                        "didplc-abcdefghijklmnopqrstuvwxyz",

     

       13
       13
       +
       		"":                                                         "",

     

       14
       14
       +
       		"did-":                                                     "did-",

     

       15
       15
       +
       		"did:plc:abcdefghijklmnopqrstuvwxyz":                       "did:plc:abcdefghijklmnopqrstuvwxyz",

     

       16
       16
       +
       		"did-invalid$format:something":                             "did-invalid$format:something",

     

       17
       17
       +
       	}

     

       18
       18
       +
       

     

       19
       19
       +
       	tests := []struct {

     

       20
       20
       +
       		name     string

     

       21
       21
       +
       		input    string

     

       22
       22
       +
       		expected string

     

       23
       23
       +
       	}{}

     

       24
       24
       +
       

     

       25
       25
       +
       	for _, tc := range isFlattenedDidTests {

     

       26
       26
       +
       		tests = append(tests, struct {

     

       27
       27
       +
       			name     string

     

       28
       28
       +
       			input    string

     

       29
       29
       +
       			expected string

     

       30
       30
       +
       		}{

     

       31
       31
       +
       			name:     tc.name,

     

       32
       32
       +
       			input:    tc.input,

     

       33
       33
       +
       			expected: unflattenedMap[tc.input],

     

       34
       34
       +
       		})

     

       35
       35
       +
       	}

     

       36
       36
       +
       

     

       37
       37
       +
       	for _, tc := range tests {

     

       38
       38
       +
       		t.Run(tc.name, func(t *testing.T) {

     

       39
       39
       +
       			result := unflattenDid(tc.input)

     

       40
       40
       +
       			if result != tc.expected {

     

       41
       41
       +
       				t.Errorf("unflattenDid(%q) = %q, want %q", tc.input, result, tc.expected)

     

       42
       42
       +
       			}

     

       43
       43
       +
       		})

     

       44
       44
       +
       	}

     

       45
       45
       +
       }

     

       46
       46
       +
       

     

       47
       47
       +
       var isFlattenedDidTests = []struct {

     

       48
       48
       +
       	name     string

     

       49
       49
       +
       	input    string

     

       50
       50
       +
       	expected bool

     

       51
       51
       +
       }{

     

       52
       52
       +
       	{

     

       53
       53
       +
       		name:     "valid flattened DID",

     

       54
       54
       +
       		input:    "did-plc-abcdefghijklmnopqrstuvwxyz",

     

       55
       55
       +
       		expected: true,

     

       56
       56
       +
       	},

     

       57
       57
       +
       	{

     

       58
       58
       +
       		name:     "valid flattened DID with numbers",

     

       59
       59
       +
       		input:    "did-plc-1234567890",

     

       60
       60
       +
       		expected: true,

     

       61
       61
       +
       	},

     

       62
       62
       +
       	{

     

       63
       63
       +
       		name:     "valid flattened DID with special characters",

     

       64
       64
       +
       		input:    "did-key-z6MkhaXgBZDvotDkL5257faiztiGiC2QtKLGpbnnEGta2doK",

     

       65
       65
       +
       		expected: true,

     

       66
       66
       +
       	},

     

       67
       67
       +
       	{

     

       68
       68
       +
       		name:     "valid flattened DID with dashes",

     

       69
       69
       +
       		input:    "did-plc-abcdefghi-jklmnopqr-stuvwxyz",

     

       70
       70
       +
       		expected: true,

     

       71
       71
       +
       	},

     

       72
       72
       +
       

     

       73
       73
       +
       	{

     

       74
       74
       +
       		name:     "doesn't start with did-",

     

       75
       75
       +
       		input:    "plc-abcdefghijklmnopqrstuvwxyz",

     

       76
       76
       +
       		expected: false,

     

       77
       77
       +
       	},

     

       78
       78
       +
       	{

     

       79
       79
       +
       		name:     "no hyphen after did",

     

       80
       80
       +
       		input:    "didplc-abcdefghijklmnopqrstuvwxyz",

     

       81
       81
       +
       		expected: false,

     

       82
       82
       +
       	},

     

       83
       83
       +
       	{

     

       84
       84
       +
       		name:     "empty string",

     

       85
       85
       +
       		input:    "",

     

       86
       86
       +
       		expected: false,

     

       87
       87
       +
       	},

     

       88
       88
       +
       	{

     

       89
       89
       +
       		name:     "only did-",

     

       90
       90
       +
       		input:    "did-",

     

       91
       91
       +
       		expected: false,

     

       92
       92
       +
       	},

     

       93
       93
       +
       	{

     

       94
       94
       +
       		name:     "standard DID format, not flattened",

     

       95
       95
       +
       		input:    "did:plc:abcdefghijklmnopqrstuvwxyz",

     

       96
       96
       +
       		expected: false,

     

       97
       97
       +
       	},

     

       98
       98
       +
       	{

     

       99
       99
       +
       		name:     "invalid reconstructed DID format",

     

       100
       100
       +
       		input:    "did-invalid$format:something",

     

       101
       101
       +
       		expected: false,

     

       102
       102
       +
       	},

     

       103
       103
       +
       }

     

       104
       104
       +
       

     

       105
       105
       +
       func TestIsFlattenedDid(t *testing.T) {

     

       106
       106
       +
       	for _, tc := range isFlattenedDidTests {

     

       107
       107
       +
       		t.Run(tc.name, func(t *testing.T) {

     

       108
       108
       +
       			result := isFlattenedDid(tc.input)

     

       109
       109
       +
       			if result != tc.expected {

     

       110
       110
       +
       				t.Errorf("isFlattenedDid(%q) = %v, want %v", tc.input, result, tc.expected)

     

       111
       111
       +
       			}

     

       112
       112
       +
       		})

     

       113
       113
       +
       	}

     

       114
       114
       +
       }