Update to go 1.24

Code was copied from https://github.com/go-chi/chi/blob/master/middleware/realip.go

.gitea/workflows/image-build.yaml

@@ -0,0 +1,35 @@
+name: Build and Push Docker Image on Tag
+
+on:
+  push:
+    tags:
+      - "v*"
+
+jobs:
+  build:
+    name: Build and Push Docker Image
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          registry: code.dlmw.ch
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: code.dlmw.ch/dlmw/qv:${{ env.GITHUB_REF_NAME }}

.gitignore

@@ -29,4 +29,5 @@ go.work.sum
 *.sqlite
 
 # exclude built binary
-web
+web
+dist/

.goreleaser.yaml

@@ -0,0 +1,43 @@
+version: 2
+
+before:
+  hooks:
+    - go mod tidy
+
+builds:
+  - id: qv
+    main: ./cmd/web
+    binary: qv
+    env:
+      - CGO_ENABLED=0
+    goos:
+      - linux
+      - windows
+      - darwin
+    goarch:
+      - amd64
+      - arm64
+    goamd64:
+      - v1
+      - v2
+      - v3
+      - v4
+    goarm64:
+      - v8.0
+    ldflags:
+      - -s -w
+
+archives:
+  - id: qv-archive
+    name_template: >-
+      {{ .ProjectName }}_
+      {{- .Version }}_
+      {{- .Os }}_
+      {{- .Arch }}_
+      {{- if eq .Arch "amd64" }}{{ .Amd64 }}
+      {{- else if eq .Arch "arm64" }}{{ .Arm64 }}
+      {{- end }}
+    formats: [ "tar.gz" ]
+    format_overrides:
+      - goos: windows
+        formats: [ "zip" ]

Dockerfile

@@ -1,7 +1,4 @@
-FROM golang:1.23-alpine
+FROM golang:1.23-alpine AS build
-
-RUN mkdir /qv
-ENV QV_DATABASE_PATH="/qv/qv.sqlite"
 
 WORKDIR /usr/src/qv
 
@@ -11,4 +8,12 @@ RUN go mod download && go mod verify
 COPY . .
 RUN go build -ldflags "-s -w" -v -o /usr/local/bin/qv ./cmd/web/
 
-CMD ["qv"]
+FROM alpine
+
+RUN mkdir /qv
+ENV QV_DATABASE_PATH="/qv/qv.sqlite"
+VOLUME /qv
+
+COPY --from=build /usr/local/bin/qv /usr/local/bin/
+
+ENTRYPOINT ["qv"]

Makefile

@@ -1,18 +1,10 @@
-BINARY_NAME=qv
+.PHONY: compile compile-snapshot clean
-LD_FLAGS=-s -w
-PLATFORMS=linux/amd64 darwin/amd64 windows/amd64
-
-.PHONY: compile clean
 
 compile:
-	@for PLATFORM in $(PLATFORMS); do \
+	@goreleaser release --clean --skip=publish
-		GOOS=$$(echo $$PLATFORM | cut -d'/' -f1); \
+
-		GOARCH=$$(echo $$PLATFORM | cut -d'/' -f2); \
+compile-snapshot:
-		echo "Building for $$GOOS/$$GOARCH..."; \
+	@goreleaser release --clean --snapshot --skip=publish
-		go build -ldflags="$(LD_FLAGS)" -o "$(BINARY_NAME)-$$GOOS-$$GOARCH" ./cmd/web/ && \
-		echo "Build successful: $(BINARY_NAME)-$$GOOS-$$GOARCH" || \
-		echo "Build failed for $$GOOS/$$GOARCH"; \
-	done
 
 clean:
-	@rm qv-*-amd64
+	@rm -r dist/

cmd/web/handlers.go

@@ -277,7 +277,7 @@ func (app *application) createVotesHandleKnownVotersElection(w http.ResponseWrit
 }
 
 func (app *application) createVotesHandleUnknownVotersElection(w http.ResponseWriter, r *http.Request, election *models.Election) (string, error) {
-	voterIdentity := r.RemoteAddr
+	voterIdentity := realIP(r)
 
 	voterExists, err := app.voters.Exists(voterIdentity, election.ID)
 	if err != nil {

cmd/web/helpers.go

@@ -5,7 +5,9 @@ import (
 	"code.dlmw.ch/dlmw/qv/internal/validator"
 	"encoding/json"
 	"io"
+	"net"
 	"net/http"
+	"strings"
 )
 
 func (app *application) serverError(w http.ResponseWriter, r *http.Request, err error) {
@@ -67,3 +69,23 @@ func (app *application) unmarshalRequest(r *http.Request, dst any) error {
 
 	return nil
 }
+
+func realIP(r *http.Request) string {
+	var ip string
+
+	if tcip := r.Header.Get(http.CanonicalHeaderKey("True-Client-IP")); tcip != "" {
+		ip = tcip
+	} else if xrip := r.Header.Get(http.CanonicalHeaderKey("X-Real-IP")); xrip != "" {
+		ip = xrip
+	} else if xff := r.Header.Get(http.CanonicalHeaderKey("X-Forwarded-For")); xff != "" {
+		i := strings.Index(xff, ",")
+		if i == -1 {
+			i = len(xff)
+		}
+		ip = xff[:i]
+	}
+	if ip == "" || net.ParseIP(ip) == nil {
+		return ""
+	}
+	return ip
+}

cmd/web/middleware.go

@@ -20,7 +20,7 @@ func (app *application) recoverPanic(next http.Handler) http.Handler {
 func (app *application) logRequest(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		var (
-			ip     = r.RemoteAddr
+			ip     = realIP(r)
 			proto  = r.Proto
 			method = r.Method
 			uri    = r.URL.RequestURI()

cmd/web/openapi.yml

@@ -3,7 +3,7 @@ info:
   title: qv - dlmw
   description: |-
     This is the documentation for the qv (Quadratic Voting) API.
-  termsOfService: http://swagger.io/terms/
+  termsOfService:
   contact:
     email: dylan@dlmw.ch
   license:
@@ -11,10 +11,10 @@ info:
     url: https://www.gnu.org/licenses/gpl-3.0.txt
   version: 0.0.1
 externalDocs:
-  description: Find out more about qv # todo
+  description: Get the code
-  url: http://swagger.io # todo
+  url: https://code.dlmw.ch/dlmw/qv
 servers:
-  - url: https://petstore3.swagger.io/api/v3 # todo
+  - url: https://qv.dlmw.ch/api
 tags:
   - name: election
     description: Retrieve data related to elections

go.mod

@@ -1,6 +1,6 @@
 module code.dlmw.ch/dlmw/qv
 
-go 1.23.4
+go 1.24
 
 require (
 	github.com/golang-migrate/migrate/v4 v4.18.1

ui/create-election.html

@@ -98,7 +98,15 @@
                             :href="`/election/${createdElectionId}`"
                             class="text-blue-600 underline hover:text-blue-800"
                             target="_blank">
-                        View Election
+                        View election
+                    </a>
+                </p>
+                <p>
+                    <a
+                            :href="`/election/${createdElectionId}/results`"
+                            class="text-blue-600 underline hover:text-blue-800"
+                            target="_blank">
+                        View results
                     </a>
                 </p>
             </div>