commit 40342269e237d976b21bcb53a090020956eb7ff3 · notnite.com/core

+1 -7

appview/db/pulls.go

···

       83
       83
        
       	return pullAt, err

     

       84
       84
        
       }

     

       85
       85
        
       

     

       86
       86
       -
       func GetPullId(e Execer, repoAt syntax.ATURI) (int, error) {

     

       86
       86
       +
       func NextPullId(e Execer, repoAt syntax.ATURI) (int, error) {

     

       87
       87
        
       	var pullId int

     

       88
       88
        
       	err := e.QueryRow(`select next_pull_id from repo_pull_seqs where repo_at = ?`, repoAt).Scan(&pullId)

     

       89
       89
        
       	return pullId - 1, err

     

       90
       90
       -
       }

     

       91
       91
       -
       

     

       92
       92
       -
       func GetPullOwnerDid(e Execer, repoAt syntax.ATURI, pullId int) (string, error) {

     

       93
       93
       -
       	var ownerDid string

     

       94
       94
       -
       	err := e.QueryRow(`select owner_did from pulls where repo_at = ? and pull_id = ?`, repoAt, pullId).Scan(&ownerDid)

     

       95
       95
       -
       	return ownerDid, err

     

       96
       90
        
       }

     

       97
       91
        
       

     

       98
       92
        
       func GetPulls(e Execer, repoAt syntax.ATURI) ([]Pull, error) {

appview/pages/pages.go

···

       509
       509
        
       type RepoNewPullParams struct {

     

       510
       510
        
       	LoggedInUser *auth.User

     

       511
       511
        
       	RepoInfo     RepoInfo

     

       512
       512
       +
       	Branches     []types.Branch

     

       512
       513
        
       	Active       string

     

       513
       514
        
       }

     

       514
       515

+10 -1

appview/pages/templates/repo/pulls/new.html

···

       15
       15
        
                       <p class="text-gray-500">

     

       16
       16
        
                           The branch you want to make your change against.

     

       17
       17
        
                       </p>

     

       18
       18
       -
                       <input type="text" name="targetBranch" id="targetBranch" />

     

       18
       18
       +
                       <select class="p-1 border border-gray-200 bg-white">

     

       19
       19
       +
                         <option disabled selected>Select a branch</option>

     

       20
       20
       +
                         {{ range .Branches }}

     

       21
       21
       +
                         <option

     

       22
       22
       +
                             value="{{ .Reference.Name }}"

     

       23
       23
       +
                             class="py-1">

     

       24
       24
       +
                             {{ .Reference.Name }}

     

       25
       25
       +
                         </option>

     

       26
       26
       +
                         {{ end }}

     

       27
       27
       +
                       </select>

     

       19
       28
        
                   </div>

     

       20
       29
        
                   <div>

     

       21
       30
        
                       <label for="body">body</label>

-2

appview/pages/templates/settings.html

···

       12
       12
        
       {{ end }}

     

       13
       13
        
       

     

       14
       14
        
       {{ define "profile" }}

     

       15
       15
       -
       <<<<<<< HEAD

     

       16
       15
        
       <h2 class="text-sm font-bold py-2 px-6 uppercase">profile</h2>

     

       17
       16
        
       <section class="rounded bg-white drop-shadow-sm px-6 py-4 mb-6 w-full lg:w-fit">

     

       18
       17
        
         <dl class="grid grid-cols-[auto_1fr] gap-x-4">

     
···

       29
       28
        
       {{ end }}

     

       30
       29
        
       

     

       31
       30
        
       {{ define "keys" }}

     

       32
       32
       -
       <<<<<<< HEAD

     

       33
       31
        
       <h2 class="text-sm font-bold py-2 px-6 uppercase">ssh keys</h2>

     

       34
       32
        
       <section class="rounded bg-white drop-shadow-sm px-6 py-4 mb-6 w-full lg:w-fit">

     

       35
       33
        
         <div id="key-list" class="flex flex-col gap-6 mb-8">

+173

appview/randomart/randomart.go

···

       1
       1
       +
       package randomart

     

       2
       2
       +
       

     

       3
       3
       +
       /*

     

       4
       4
       +
        * Draw an ASCII-Art representing the fingerprint so human brain can

     

       5
       5
       +
        * profit from its built-in pattern recognition ability.

     

       6
       6
       +
        * This technique is called "random art" and can be found in some

     

       7
       7
       +
        * scientific publications like this original paper:

     

       8
       8
       +
        *

     

       9
       9
       +
        * "Hash Visualization: a New Technique to improve Real-World Security",

     

       10
       10
       +
        * Perrig A. and Song D., 1999, International Workshop on Cryptographic

     

       11
       11
       +
        * Techniques and E-Commerce (CrypTEC '99)

     

       12
       12
       +
        * sparrow.ece.cmu.edu/~adrian/projects/validation/validation.pdf

     

       13
       13
       +
        *

     

       14
       14
       +
        * The subject came up in a talk by Dan Kaminsky, too.

     

       15
       15
       +
        *

     

       16
       16
       +
        * If you see the picture is different, the key is different.

     

       17
       17
       +
        * If the picture looks the same, you still know nothing.

     

       18
       18
       +
        *

     

       19
       19
       +
        * The algorithm used here is a worm crawling over a discrete plane,

     

       20
       20
       +
        * leaving a trace (augmenting the field) everywhere it goes.

     

       21
       21
       +
        * Movement is taken from dgst_raw 2bit-wise.  Bumping into walls

     

       22
       22
       +
        * makes the respective movement vector be ignored for this turn.

     

       23
       23
       +
        * Graphs are not unambiguous, because circles in graphs can be

     

       24
       24
       +
        * walked in either direction.

     

       25
       25
       +
        */

     

       26
       26
       +
       

     

       27
       27
       +
       import (

     

       28
       28
       +
       	"os"

     

       29
       29
       +
       )

     

       30
       30
       +
       

     

       31
       31
       +
       func MAX(a, b int) int {

     

       32
       32
       +
       	if a > b {

     

       33
       33
       +
       		return a

     

       34
       34
       +
       	}

     

       35
       35
       +
       	return b

     

       36
       36
       +
       }

     

       37
       37
       +
       

     

       38
       38
       +
       func MIN(a, b int) int {

     

       39
       39
       +
       	if a < b {

     

       40
       40
       +
       		return a

     

       41
       41
       +
       	}

     

       42
       42
       +
       	return b

     

       43
       43
       +
       }

     

       44
       44
       +
       

     

       45
       45
       +
       /*

     

       46
       46
       +
        * Field sizes for the random art.  Have to be odd, so the starting point

     

       47
       47
       +
        * can be in the exact middle of the picture, and FLDBASE should be >=8 .

     

       48
       48
       +
        * Else pictures would be too dense, and drawing the frame would

     

       49
       49
       +
        * fail, too, because the key type would not fit in anymore.

     

       50
       50
       +
        */

     

       51
       51
       +
       const (

     

       52
       52
       +
       	FLDBASE   = 8

     

       53
       53
       +
       	FLDSIZE_Y = (FLDBASE + 1)

     

       54
       54
       +
       	FLDSIZE_X = (FLDBASE*2 + 1)

     

       55
       55
       +
       )

     

       56
       56
       +
       

     

       57
       57
       +
       func FromString(str string) string {

     

       58
       58
       +
       	ch := make(chan byte)

     

       59
       59
       +
       

     

       60
       60
       +
       	go func() {

     

       61
       61
       +
       		defer close(ch)

     

       62
       62
       +
       		for _, v := range []byte(str) {

     

       63
       63
       +
       			ch <- v

     

       64
       64
       +
       		}

     

       65
       65
       +
       	}()

     

       66
       66
       +
       	return key_fingerprint_randomart(ch)

     

       67
       67
       +
       }

     

       68
       68
       +
       

     

       69
       69
       +
       func FromFile(file *os.File) string {

     

       70
       70
       +
       	ch := make(chan byte)

     

       71
       71
       +
       

     

       72
       72
       +
       	go func() {

     

       73
       73
       +
       		defer close(ch)

     

       74
       74
       +
       		// TODO make input a 1 element byte array

     

       75
       75
       +
       		input := make([]byte, 1)

     

       76
       76
       +
       		nread, err := file.Read(input)

     

       77
       77
       +
       		for err == nil && nread > 0 {

     

       78
       78
       +
       			ch <- input[0]

     

       79
       79
       +
       			nread, err = file.Read(input)

     

       80
       80
       +
       		}

     

       81
       81
       +
       	}()

     

       82
       82
       +
       	return key_fingerprint_randomart(ch)

     

       83
       83
       +
       }

     

       84
       84
       +
       

     

       85
       85
       +
       func key_fingerprint_randomart(ch chan byte) string {

     

       86
       86
       +
       	/*

     

       87
       87
       +
       	 * Chars to be used after each other every time the worm

     

       88
       88
       +
       	 * intersects with itself.  Matter of taste.

     

       89
       89
       +
       	 */

     

       90
       90
       +
       	augment_string := " .o+=*BOX@%&#/^SE"

     

       91
       91
       +
       	var field [FLDSIZE_X][FLDSIZE_Y]byte

     

       92
       92
       +
       	len_aug := len(augment_string) - 1

     

       93
       93
       +
       	var retval [(FLDSIZE_X + 3) * (FLDSIZE_Y + 2)]byte

     

       94
       94
       +
       

     

       95
       95
       +
       	/* initialize field */

     

       96
       96
       +
       	x := FLDSIZE_X / 2

     

       97
       97
       +
       	y := FLDSIZE_Y / 2

     

       98
       98
       +
       

     

       99
       99
       +
       	/* process raw key */

     

       100
       100
       +
       	for input, ok := <-ch; ok; input, ok = <-ch {

     

       101
       101
       +
       		/* each byte conveys four 2-bit move commands */

     

       102
       102
       +
       		for b := 0; b < 4; b++ {

     

       103
       103
       +
       			/* evaluate 2 bit, rest is shifted later */

     

       104
       104
       +
       			if input&0x1 > 0 {

     

       105
       105
       +
       				x += 1

     

       106
       106
       +
       			} else {

     

       107
       107
       +
       				x += -1

     

       108
       108
       +
       			}

     

       109
       109
       +
       

     

       110
       110
       +
       			if input&0x2 > 0 {

     

       111
       111
       +
       				y++

     

       112
       112
       +
       			} else {

     

       113
       113
       +
       				y--

     

       114
       114
       +
       			}

     

       115
       115
       +
       

     

       116
       116
       +
       			/* assure we are still in bounds */

     

       117
       117
       +
       			x = MAX(x, 0)

     

       118
       118
       +
       			y = MAX(y, 0)

     

       119
       119
       +
       			x = MIN(x, FLDSIZE_X-1)

     

       120
       120
       +
       			y = MIN(y, FLDSIZE_Y-1)

     

       121
       121
       +
       

     

       122
       122
       +
       			/* augment the field */

     

       123
       123
       +
       			if int(field[x][y]) < len_aug-2 {

     

       124
       124
       +
       				field[x][y]++

     

       125
       125
       +
       			}

     

       126
       126
       +
       			input = input >> 2

     

       127
       127
       +
       		}

     

       128
       128
       +
       	}

     

       129
       129
       +
       

     

       130
       130
       +
       	/* mark starting point and end point*/

     

       131
       131
       +
       	field[FLDSIZE_X/2][FLDSIZE_Y/2] = byte(len_aug - 1)

     

       132
       132
       +
       	field[x][y] = byte(len_aug)

     

       133
       133
       +
       

     

       134
       134
       +
       	i := 0

     

       135
       135
       +
       	retval[i] = '+'

     

       136
       136
       +
       	i++

     

       137
       137
       +
       

     

       138
       138
       +
       	/* output upper border */

     

       139
       139
       +
       	for x := 0; x < FLDSIZE_X; x++ {

     

       140
       140
       +
       		retval[i] = '-'

     

       141
       141
       +
       		i++

     

       142
       142
       +
       	}

     

       143
       143
       +
       	retval[i] = '+'

     

       144
       144
       +
       	i++

     

       145
       145
       +
       	retval[i] = '\n'

     

       146
       146
       +
       	i++

     

       147
       147
       +
       

     

       148
       148
       +
       	/* output content */

     

       149
       149
       +
       	for y := 0; y < FLDSIZE_Y; y++ {

     

       150
       150
       +
       		retval[i] = '|'

     

       151
       151
       +
       		i++

     

       152
       152
       +
       		for x := 0; x < FLDSIZE_X; x++ {

     

       153
       153
       +
       			retval[i] = augment_string[MIN(int(field[x][y]), len_aug)]

     

       154
       154
       +
       			i++

     

       155
       155
       +
       		}

     

       156
       156
       +
       		retval[i] = '|'

     

       157
       157
       +
       		i++

     

       158
       158
       +
       		retval[i] = '\n'

     

       159
       159
       +
       		i++

     

       160
       160
       +
       	}

     

       161
       161
       +
       

     

       162
       162
       +
       	/* output lower border */

     

       163
       163
       +
       	retval[i] = '+'

     

       164
       164
       +
       	i++

     

       165
       165
       +
       	for j := 0; j < FLDSIZE_X; j++ {

     

       166
       166
       +
       		retval[i] = '-'

     

       167
       167
       +
       		i++

     

       168
       168
       +
       	}

     

       169
       169
       +
       	retval[i] = '+'

     

       170
       170
       +
       	i++

     

       171
       171
       +
       

     

       172
       172
       +
       	return string(retval[0:i])

     

       173
       173
       +
       }

+41 -12

appview/state/repo.go

···

       35
       35
        
       		log.Println("failed to fully resolve repo", err)

     

       36
       36
        
       		return

     

       37
       37
        
       	}

     

       38
       38
       -
       	protocol := "http"

     

       39
       39
       -
       	if !s.config.Dev {

     

       40
       40
       -
       		protocol = "https"

     

       41
       41
       -
       	}

     

       42
       38
        
       

     

       43
       43
       -
       	var reqUrl string

     

       44
       44
       -
       	if ref != "" {

     

       45
       45
       -
       		reqUrl = fmt.Sprintf("%s://%s/%s/%s/tree/%s", protocol, f.Knot, f.OwnerDid(), f.RepoName, ref)

     

       46
       46
       -
       	} else {

     

       47
       47
       -
       		reqUrl = fmt.Sprintf("%s://%s/%s/%s", protocol, f.Knot, f.OwnerDid(), f.RepoName)

     

       39
       39
       +
       	us, err := NewUnsignedClient(f.Knot, s.config.Dev)

     

       40
       40
       +
       	if err != nil {

     

       41
       41
       +
       		log.Printf("failed to create unsigned client for %s", f.Knot)

     

       42
       42
       +
       		s.pages.Error503(w)

     

       43
       43
       +
       		return

     

       48
       44
        
       	}

     

       49
       45
        
       

     

       50
       50
       -
       	resp, err := http.Get(reqUrl)

     

       46
       46
       +
       	resp, err := us.Index(f.OwnerDid(), f.RepoName, ref)

     

       51
       47
        
       	if err != nil {

     

       52
       48
        
       		s.pages.Error503(w)

     

       53
       49
        
       		log.Println("failed to reach knotserver", err)

     
···

       303
       299
        
       

     

       304
       300
        
       	switch r.Method {

     

       305
       301
        
       	case http.MethodGet:

     

       302
       302
       +
       		us, err := NewUnsignedClient(f.Knot, s.config.Dev)

     

       303
       303
       +
       		if err != nil {

     

       304
       304
       +
       			log.Printf("failed to create unsigned client for %s", f.Knot)

     

       305
       305
       +
       			s.pages.Error503(w)

     

       306
       306
       +
       			return

     

       307
       307
       +
       		}

     

       308
       308
       +
       

     

       309
       309
       +
       		resp, err := us.Branches(f.OwnerDid(), f.RepoName)

     

       310
       310
       +
       		if err != nil {

     

       311
       311
       +
       			log.Println("failed to reach knotserver", err)

     

       312
       312
       +
       			return

     

       313
       313
       +
       		}

     

       314
       314
       +
       

     

       315
       315
       +
       		body, err := io.ReadAll(resp.Body)

     

       316
       316
       +
       		if err != nil {

     

       317
       317
       +
       			log.Printf("Error reading response body: %v", err)

     

       318
       318
       +
       			return

     

       319
       319
       +
       		}

     

       320
       320
       +
       

     

       321
       321
       +
       		var result types.RepoBranchesResponse

     

       322
       322
       +
       		err = json.Unmarshal(body, &result)

     

       323
       323
       +
       		if err != nil {

     

       324
       324
       +
       			log.Println("failed to parse response:", err)

     

       325
       325
       +
       			return

     

       326
       326
       +
       		}

     

       327
       327
       +
       

     

       306
       328
        
       		s.pages.RepoNewPull(w, pages.RepoNewPullParams{

     

       307
       329
        
       			LoggedInUser: user,

     

       308
       330
        
       			RepoInfo:     f.RepoInfo(s, user),

     

       331
       331
       +
       			Branches:     result.Branches,

     

       309
       332
        
       		})

     

       310
       333
        
       	case http.MethodPost:

     

       311
       334
        
       		title := r.FormValue("title")

     
···

       347
       370
        
       			return

     

       348
       371
        
       		}

     

       349
       372
        
       		client, _ := s.auth.AuthorizedClient(r)

     

       350
       350
       -
       		pullId, err := db.GetPullId(s.db, f.RepoAt)

     

       373
       373
       +
       		pullId, err := db.NextPullId(s.db, f.RepoAt)

     

       351
       374
        
       		if err != nil {

     

       352
       375
        
       			log.Println("failed to get pull id", err)

     

       353
       376
        
       			s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")

     
···

       604
       627
        
       		return

     

       605
       628
        
       	}

     

       606
       629
        
       

     

       607
       607
       -
       	resp, err := http.Get(fmt.Sprintf("http://%s/%s/%s/branches", f.Knot, f.OwnerDid(), f.RepoName))

     

       630
       630
       +
       	us, err := NewUnsignedClient(f.Knot, s.config.Dev)

     

       631
       631
       +
       	if err != nil {

     

       632
       632
       +
       		log.Println("failed to create unsigned client", err)

     

       633
       633
       +
       		return

     

       634
       634
       +
       	}

     

       635
       635
       +
       

     

       636
       636
       +
       	resp, err := us.Branches(f.OwnerDid(), f.RepoName)

     

       608
       637
        
       	if err != nil {

     

       609
       638
        
       		log.Println("failed to reach knotserver", err)

     

       610
       639
        
       		return

+67 -3

appview/state/signer.go

···

       41
       41
        
       		},

     

       42
       42
        
       	}

     

       43
       43
        
       

     

       44
       44
       -
       	uri := "https"

     

       44
       44
       +
       	scheme := "https"

     

       45
       45
        
       	if dev {

     

       46
       46
       -
       		uri = "http"

     

       46
       46
       +
       		scheme = "http"

     

       47
       47
        
       	}

     

       48
       48
       -
       	url, err := url.Parse(fmt.Sprintf("%s://%s", uri, domain))

     

       48
       48
       +
       	url, err := url.Parse(fmt.Sprintf("%s://%s", scheme, domain))

     

       49
       49
        
       	if err != nil {

     

       50
       50
        
       		return nil, err

     

       51
       51
        
       	}

     
···

       193
       193
        
       

     

       194
       194
        
       	return s.client.Do(req)

     

       195
       195
        
       }

     

       196
       196
       +
       

     

       197
       197
       +
       type UnsignedClient struct {

     

       198
       198
       +
       	Url    *url.URL

     

       199
       199
       +
       	client *http.Client

     

       200
       200
       +
       }

     

       201
       201
       +
       

     

       202
       202
       +
       func NewUnsignedClient(domain string, dev bool) (*UnsignedClient, error) {

     

       203
       203
       +
       	client := &http.Client{

     

       204
       204
       +
       		Timeout: 5 * time.Second,

     

       205
       205
       +
       	}

     

       206
       206
       +
       

     

       207
       207
       +
       	scheme := "https"

     

       208
       208
       +
       	if dev {

     

       209
       209
       +
       		scheme = "http"

     

       210
       210
       +
       	}

     

       211
       211
       +
       	url, err := url.Parse(fmt.Sprintf("%s://%s", scheme, domain))

     

       212
       212
       +
       	if err != nil {

     

       213
       213
       +
       		return nil, err

     

       214
       214
       +
       	}

     

       215
       215
       +
       

     

       216
       216
       +
       	unsignedClient := &UnsignedClient{

     

       217
       217
       +
       		client: client,

     

       218
       218
       +
       		Url:    url,

     

       219
       219
       +
       	}

     

       220
       220
       +
       

     

       221
       221
       +
       	return unsignedClient, nil

     

       222
       222
       +
       }

     

       223
       223
       +
       

     

       224
       224
       +
       func (us *UnsignedClient) newRequest(method, endpoint string, body []byte) (*http.Request, error) {

     

       225
       225
       +
       	return http.NewRequest(method, us.Url.JoinPath(endpoint).String(), bytes.NewReader(body))

     

       226
       226
       +
       }

     

       227
       227
       +
       

     

       228
       228
       +
       func (us *UnsignedClient) Index(ownerDid, repoName, ref string) (*http.Response, error) {

     

       229
       229
       +
       	const (

     

       230
       230
       +
       		Method = "GET"

     

       231
       231
       +
       	)

     

       232
       232
       +
       

     

       233
       233
       +
       	endpoint := fmt.Sprintf("/%s/%s/tree/%s", ownerDid, repoName, ref)

     

       234
       234
       +
       	if ref == "" {

     

       235
       235
       +
       		endpoint = fmt.Sprintf("/%s/%s", ownerDid, repoName)

     

       236
       236
       +
       	}

     

       237
       237
       +
       

     

       238
       238
       +
       	req, err := us.newRequest(Method, endpoint, nil)

     

       239
       239
       +
       	if err != nil {

     

       240
       240
       +
       		return nil, err

     

       241
       241
       +
       	}

     

       242
       242
       +
       

     

       243
       243
       +
       	return us.client.Do(req)

     

       244
       244
       +
       }

     

       245
       245
       +
       

     

       246
       246
       +
       func (us *UnsignedClient) Branches(ownerDid, repoName string) (*http.Response, error) {

     

       247
       247
       +
       	const (

     

       248
       248
       +
       		Method = "GET"

     

       249
       249
       +
       	)

     

       250
       250
       +
       

     

       251
       251
       +
       	endpoint := fmt.Sprintf("/%s/%s/branches", ownerDid, repoName)

     

       252
       252
       +
       

     

       253
       253
       +
       	req, err := us.newRequest(Method, endpoint, nil)

     

       254
       254
       +
       	if err != nil {

     

       255
       255
       +
       		return nil, err

     

       256
       256
       +
       	}

     

       257
       257
       +
       

     

       258
       258
       +
       	return us.client.Do(req)

     

       259
       259
       +
       }