Merge branch 'tailscale:main' into main

Author: gautamg795

README.md

@@ -96,7 +96,7 @@ strategy = "immediate"
 
 [mounts]
 source="FLY_VOLUME_NAME"
-destination="/root"
+destination="/home/nonroot"
 ```
 
   Then run the commands with the [flyctl CLI].

golink.go

@@ -145,6 +145,7 @@ func Run() error {
 	http.HandleFunc("/.export", serveExport)
 	http.HandleFunc("/.help", serveHelp)
 	http.HandleFunc("/.opensearch", serveOpenSearch)
+	http.HandleFunc("/.all", serveAll)
 	http.Handle("/.static/", http.StripPrefix("/.", http.FileServer(http.FS(embeddedFS))))
 
 	if *dev != "" {
@@ -223,6 +224,9 @@ var (
 	// helpTmpl is the template used by the http://go/.help page
 	helpTmpl *template.Template
 
+	// allTmpl is the template used by the http://go/.all page
+	allTmpl *template.Template
+
 	// opensearchTmpl is the template used by the http://go/.opensearch page
 	opensearchTmpl *template.Template
 )
@@ -243,6 +247,7 @@ func init() {
 	detailTmpl = template.Must(template.ParseFS(embeddedFS, "tmpl/base.html", "tmpl/detail.html"))
 	successTmpl = template.Must(template.ParseFS(embeddedFS, "tmpl/base.html", "tmpl/success.html"))
 	helpTmpl = template.Must(template.ParseFS(embeddedFS, "tmpl/base.html", "tmpl/help.html"))
+	allTmpl = template.Must(template.ParseFS(embeddedFS, "tmpl/base.html", "tmpl/all.html"))
 	opensearchTmpl = template.Must(template.ParseFS(embeddedFS, "tmpl/opensearch.xml"))
 }
 
@@ -267,6 +272,10 @@ func flushStats() error {
 	stats.mu.Lock()
 	defer stats.mu.Unlock()
 
+	if len(stats.dirty) == 0 {
+		return nil
+	}
+
 	if err := db.SaveStats(stats.dirty); err != nil {
 		return err
 	}
@@ -312,6 +321,24 @@ func serveHome(w http.ResponseWriter, short string) {
 	})
 }
 
+func serveAll(w http.ResponseWriter, _ *http.Request) {
+	if err := flushStats(); err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+
+	links, err := db.LoadAll()
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+		return
+	}
+	sort.Slice(links, func(i, j int) bool {
+		return links[i].Short < links[j].Short
+	})
+
+	allTmpl.Execute(w, links)
+}
+
 func serveHelp(w http.ResponseWriter, _ *http.Request) {
 	helpTmpl.Execute(w, nil)
 }
@@ -366,7 +393,9 @@ func serveGo(w http.ResponseWriter, r *http.Request) {
 	stats.dirty[link.Short]++
 	stats.mu.Unlock()
 
-	target, err := expandLink(link.Long, expandEnv{Now: time.Now().UTC(), Path: remainder})
+	currentUser, _ := currentUser(r)
+
+	target, err := expandLink(link.Long, expandEnv{Now: time.Now().UTC(), Path: remainder, User: currentUser})
 	if err != nil {
 		log.Printf("expanding %q: %v", link.Long, err)
 		http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -430,6 +459,10 @@ type expandEnv struct {
 	// Path is the remaining path after short name.  For example, in
 	// "http://go/who/amelie", Path is "amelie".
 	Path string
+
+	// User is the current user, if any.
+	// For example, "[email protected]" or "foo@github".
+	User string
 }
 
 var expandFuncMap = texttemplate.FuncMap{

golink_test.go

@@ -10,11 +10,12 @@ import (
 
 func TestExpandLink(t *testing.T) {
 	tests := []struct {
-		name      string
-		long      string
-		now       time.Time
-		remainder string
-		want      string
+		name      string    // test name
+		long      string    // long URL for golink
+		now       time.Time // current time
+		user      string    // current user resolving link
+		remainder string    // remainder of URL path after golink name
+		want      string    // expected redirect URL
 	}{
 		{
 			name: "dont-mangle-escapes",
@@ -45,6 +46,12 @@ func TestExpandLink(t *testing.T) {
 			want: "https://roamresearch.com/#/app/ts-corp/page/06-02-2022",
 			now:  time.Date(2022, 06, 02, 1, 2, 3, 4, time.UTC),
 		},
+		{
+			name: "var-expansions-user",
+			long: `http://host.com/{{.User}}`,
+			user: "[email protected]",
+			want: "http://host.com/[email protected]",
+		},
 		{
 			name: "template-no-path",
 			long: "https://calendar.google.com/{{with .Path}}calendar/embed?mode=week&src={{.}}@tailscale.com{{end}}",
@@ -58,7 +65,7 @@ func TestExpandLink(t *testing.T) {
 		},
 		{
 			name:      "template-with-pathescape-func",
-			long:      "http://host.com/{{QueryEscape .Path}}",
+			long:      "http://host.com/{{PathEscape .Path}}",
 			remainder: "a/b",
 			want:      "http://host.com/a%2Fb",
 		},
@@ -77,7 +84,7 @@ func TestExpandLink(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := expandLink(tt.long, expandEnv{Now: tt.now, Path: tt.remainder})
+			got, err := expandLink(tt.long, expandEnv{Now: tt.now, Path: tt.remainder, User: tt.user})
 			if err != nil {
 				t.Fatalf("expandLink(%q): %v", tt.long, err)
 			}

static/base.css

@@ -1230,10 +1230,38 @@ select {
   display: table;
 }
 
+.hidden {
+  display: none;
+}
+
 .min-h-screen {
   min-height: 100vh;
 }
 
+.w-full {
+  width: 100%;
+}
+
+.w-60 {
+  width: 15rem;
+}
+
+.w-32 {
+  width: 8rem;
+}
+
+.w-20 {
+  width: 5rem;
+}
+
+.max-w-screen-lg {
+  max-width: 1024px;
+}
+
+.max-w-\[75vw\] {
+  max-width: 75vw;
+}
+
 .max-w-full {
   max-width: 100%;
 }
@@ -1262,6 +1290,12 @@ select {
   align-items: center;
 }
 
+.truncate {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
 .rounded-md {
   border-radius: 0.375rem;
 }
@@ -1321,11 +1355,6 @@ select {
   padding: 0.5rem;
 }
 
-.px-4 {
-  padding-left: 1rem;
-  padding-right: 1rem;
-}
-
 .px-2 {
   padding-left: 0.5rem;
   padding-right: 0.5rem;
@@ -1336,14 +1365,23 @@ select {
   padding-bottom: 0.5rem;
 }
 
-.pt-4 {
-  padding-top: 1rem;
+.px-4 {
+  padding-left: 1rem;
+  padding-right: 1rem;
+}
+
+.pt-6 {
+  padding-top: 1.5rem;
 }
 
 .pb-2 {
   padding-bottom: 0.5rem;
 }
 
+.pt-4 {
+  padding-top: 1rem;
+}
+
 .pb-1 {
   padding-bottom: 0.25rem;
 }
@@ -1352,10 +1390,6 @@ select {
   padding-top: 0.5rem;
 }
 
-.pt-6 {
-  padding-top: 1.5rem;
-}
-
 .pr-4 {
   padding-right: 1rem;
 }
@@ -1368,28 +1402,32 @@ select {
   text-align: right;
 }
 
-.align-text-top {
-  vertical-align: text-top;
+.text-end {
+  text-align: end;
 }
 
-.text-2xl {
-  font-size: 1.5rem;
-  line-height: 2rem;
+.align-text-top {
+  vertical-align: text-top;
 }
 
 .text-xl {
   font-size: 1.25rem;
   line-height: 1.75rem;
 }
 
+.text-xs {
+  font-size: 0.75rem;
+  line-height: 1rem;
+}
+
 .text-sm {
   font-size: 0.875rem;
   line-height: 1.25rem;
 }
 
-.text-xs {
-  font-size: 0.75rem;
-  line-height: 1rem;
+.text-2xl {
+  font-size: 1.5rem;
+  line-height: 2rem;
 }
 
 .font-bold {
@@ -1400,18 +1438,22 @@ select {
   text-transform: uppercase;
 }
 
+.leading-normal {
+  line-height: 1.5;
+}
+
 .leading-6 {
   line-height: 1.5rem;
 }
 
-.text-gray-700 {
+.text-gray-500 {
   --tw-text-opacity: 1;
-  color: rgb(71 70 69 / var(--tw-text-opacity));
+  color: rgb(159 153 149 / var(--tw-text-opacity));
 }
 
-.text-gray-500 {
+.text-gray-700 {
   --tw-text-opacity: 1;
-  color: rgb(159 153 149 / var(--tw-text-opacity));
+  color: rgb(71 70 69 / var(--tw-text-opacity));
 }
 
 .text-blue-600 {
@@ -1439,14 +1481,14 @@ select {
   border-color: rgb(77 120 200 / var(--tw-border-opacity));
 }
 
-.hover\:bg-blue-600:hover {
+.hover\:bg-gray-100:hover {
   --tw-bg-opacity: 1;
-  background-color: rgb(77 120 200 / var(--tw-bg-opacity));
+  background-color: rgb(246 244 242 / var(--tw-bg-opacity));
 }
 
-.hover\:bg-gray-100:hover {
+.hover\:bg-blue-600:hover {
   --tw-bg-opacity: 1;
-  background-color: rgb(246 244 242 / var(--tw-bg-opacity));
+  background-color: rgb(77 120 200 / var(--tw-bg-opacity));
 }
 
 .hover\:fill-blue-500:hover {
@@ -1469,4 +1511,23 @@ select {
 
 .group:hover .group-hover\:visible {
   visibility: visible;
+}
+
+.group:hover .group-hover\:text-gray-700 {
+  --tw-text-opacity: 1;
+  color: rgb(71 70 69 / var(--tw-text-opacity));
+}
+
+@media (min-width: 768px) {
+  .md\:block {
+    display: block;
+  }
+
+  .md\:hidden {
+    display: none;
+  }
+
+  .md\:max-w-\[40vw\] {
+    max-width: 40vw;
+  }
 }

tmpl/all.html

@@ -0,0 +1,36 @@
+{{ define "main" }}
+    <h2 class="text-xl font-bold pt-6 pb-2">All Links ({{ len . }} total)</h2>
+    <table class="table-auto w-full max-w-screen-lg">
+      <thead class="border-b border-gray-200 uppercase text-xs text-gray-500 text-left">
+        <tr class="flex">
+          <th class="flex-1 p-2">Link</th>
+          <th class="hidden md:block w-60 truncate p-2">Owner</th>
+          <th class="hidden md:block w-32 p-2">Last Edited</th>
+        </tr>
+      </thead>
+      <tbody>
+      {{ range . }}
+        <tr class="flex hover:bg-gray-100 group border-b border-gray-200">
+          <td class="flex-1 p-2">
+            <div class="flex">
+              <a class="flex-1 hover:text-blue-500 hover:underline" href="/{{ .Short }}">go/{{ .Short }}</a>
+              <a class="flex items-center px-2 invisible group-hover:visible" title="Link Details" href="/.detail/{{ .Short }}">
+                <svg class="hover:fill-blue-500" xmlns="http://www.w3.org/2000/svg" height="1.3em" viewBox="0 0 24 24" width="1.3em" fill="#000000" stroke-width="2"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M11 7h2v2h-2zm0 4h2v6h-2zm1-9C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8z"/></svg>
+              </a>
+            </div>
+            <p class="text-sm leading-normal text-gray-500 group-hover:text-gray-700 max-w-[75vw] md:max-w-[40vw] truncate">{{ .Long }}</p>
+            <p class="md:hidden text-sm leading-normal text-gray-700"><span class="text-gray-500 inline-block w-20">Owner</span> {{ .Owner }}</p>
+            <p class="md:hidden text-sm leading-normal text-gray-700"><span class="text-gray-500 inline-block w-20">Last Edited</span> {{ .LastEdit.Format "Jan 2, 2006" }}</p>
+          </td>
+          <td class="hidden md:block w-60 truncate p-2">{{ .Owner }}</td>
+          <td class="hidden md:block w-32 p-2">{{ .LastEdit.Format "Jan 2, 2006" }}</td>
+        </tr>
+      {{ end }}
+      </tbody>
+      <tfoot>
+        <tr>
+          <td class="text-sm text-end text-gray-500 py-2"><a class="hover:underline hover:text-blue-500" href="/.export">Download all links in JSON Lines format.</a></td>
+        </tr>
+      </tfoot>
+    </table>
+{{ end }}