fix: portrait exports should be real portraits (#854)

Author: Proximyst

pkg/api/middleware/auth.go

@@ -16,9 +16,8 @@ var MetricAuthenticatedRequestAttempt = prometheus.NewCounterVec(prometheus.Coun
 func RequireAuthToken(h http.Handler, expectedTokens ...string) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		tracer := tracer(r.Context())
-		ctx, span := tracer.Start(r.Context(), "RequireAuthToken")
+		_, span := tracer.Start(r.Context(), "RequireAuthToken")
 		defer span.End()
-		r = r.WithContext(ctx)
 
 		token := r.Header.Get("X-Auth-Token")
 		if token == "" {
@@ -28,6 +27,7 @@ func RequireAuthToken(h http.Handler, expectedTokens ...string) http.Handler {
 		}
 		if slices.Contains(expectedTokens, token) {
 			MetricAuthenticatedRequestAttempt.WithLabelValues("valid-token").Inc()
+			span.End() // we don't want to track the next middleware in this span
 			h.ServeHTTP(w, r)
 			return
 		}

pkg/api/middleware/ratelimiter.go

@@ -72,6 +72,7 @@ func (p processBasedLimiter) Limit(next http.Handler) http.Handler {
 			// > Consider using the more ergonomic and less error-prone [Uint32.Add] instead.
 			defer p.running.Add(^uint32(0)) // decrement
 
+			span.End() // we don't want to track the next middleware in this span
 			next.ServeHTTP(w, r)
 		}
 	})

pkg/api/middleware/recovery.go

@@ -30,6 +30,7 @@ func Recovery(h http.Handler) http.Handler {
 				span.SetStatus(codes.Error, "panic in HTTP handler")
 			}
 		}()
+
 		h.ServeHTTP(w, r)
 		span.SetStatus(codes.Ok, "no panic")
 	})

pkg/api/middleware/trustedurl.go

@@ -16,14 +16,14 @@ var MetricTrustedURLRequests = prometheus.NewCounterVec(prometheus.CounterOpts{
 func TrustedURL(h http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		tracer := tracer(r.Context())
-		ctx, span := tracer.Start(r.Context(), "TrustedURL")
+		_, span := tracer.Start(r.Context(), "TrustedURL")
 		defer span.End()
-		r = r.WithContext(ctx)
 
 		urlQuery := r.URL.Query().Get("url")
 		if urlQuery == "" {
 			// Nothing to check: let it through.
 			MetricTrustedURLRequests.WithLabelValues("missing-query").Inc()
+			span.End() // we don't want to track the next middleware in this span
 			h.ServeHTTP(w, r)
 			return
 		}
@@ -42,6 +42,7 @@ func TrustedURL(h http.Handler) http.Handler {
 		}
 
 		MetricTrustedURLRequests.WithLabelValues("valid").Inc()
+		span.End() // we don't want to track the next middleware in this span
 		h.ServeHTTP(w, r)
 	})
 }

pkg/api/render.go

@@ -193,9 +193,14 @@ func HandleGetRender(browser *service.BrowserService) http.Handler {
 			}
 			span.SetAttributes(attribute.String("encoding", "pdf"))
 
-			if pdfLandscape := r.URL.Query().Get("pdfLandscape"); pdfLandscape != "" {
+			pdfLandscape := r.URL.Query().Get("pdf.landscape")
+			if pdfLandscape == "" {
+				// FIXME: legacy support; remove in some future release.
+				pdfLandscape = targetURL.Query().Get("pdf.landscape")
+			}
+			if pdfLandscape != "" {
 				options = append(options, service.WithLandscape(pdfLandscape == "true"))
-				span.SetAttributes(attribute.Bool("pdfLandscape", pdfLandscape == "true"))
+				span.SetAttributes(attribute.Bool("pdf.landscape", pdfLandscape == "true"))
 			}
 		case "png":
 			var printerOpts []service.PNGPrinterOption

pkg/service/browser.go

@@ -782,7 +782,14 @@ func (p *pngPrinter) prepare(cfg config.BrowserConfig) chromedp.Action {
 				orientation = chromedp.EmulateLandscape
 			}
 
-			err = chromedp.EmulateViewport(int64(cfg.MinWidth), int64(scrollHeight), orientation).Do(ctx)
+			var width, height int64
+			if cfg.Landscape {
+				width, height = int64(cfg.MinHeight), int64(scrollHeight)
+			} else {
+				width, height = int64(cfg.MinWidth), int64(scrollHeight)
+			}
+
+			err = chromedp.EmulateViewport(width, height, orientation).Do(ctx)
 			if err != nil {
 				span.SetStatus(codes.Error, "failed to resize viewport: "+err.Error())
 				return fmt.Errorf("failed to resize viewport for full height: %w", err)