Add support for &default=1 (#371)

If there is a problem loading the image, it will redirect to the URL specified in `?url=` (if that's a valid URI as per RFC 3986).
weserv · Jun 30, 2023 · adc6b9a · adc6b9a
1 parent a82438c
commit adc6b9a
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 11 deletions.
diff --git a/src/nginx/error.cpp b/src/nginx/error.cpp
@@ -10,8 +10,9 @@ using ::weserv::api::utils::Status;
 
 namespace weserv::nginx {
 
-ngx_int_t ngx_weserv_return_error(ngx_http_request_t *r, Status status,
-                                  ngx_chain_t *out) {
+ngx_int_t ngx_weserv_return_error(ngx_http_request_t *r,
+                                  ngx_weserv_upstream_ctx_t *upstream_ctx,
+                                  Status status, ngx_chain_t *out) {
     ngx_uint_t http_status = status.http_code();
 
     // Redirect if the 'default' (or 'errorredirect') query parameter is given.
@@ -21,12 +22,16 @@ ngx_int_t ngx_weserv_return_error(ngx_http_request_t *r, Status status,
     if (ngx_http_arg(r, (u_char *)"default", 7, &redirect_uri) == NGX_OK ||
         ngx_http_arg(r, (u_char *)"errorredirect", 13, &redirect_uri) ==
             NGX_OK) {
-        ngx_str_t parsed_redirect;
-        if (parse_url(r->pool, redirect_uri, &parsed_redirect) == NGX_OK) {
-            if (set_location_header(r, &parsed_redirect) != NGX_OK) {
-                return NGX_HTTP_INTERNAL_SERVER_ERROR;
-            }
+        ngx_str_t parsed_redirect = ngx_null_string;
+        if (upstream_ctx != nullptr && redirect_uri.len == 1 &&
+            redirect_uri.data[0] == '1') {
+            parsed_redirect = upstream_ctx->request->url();
+        } else {
+            (void)parse_url(r->pool, redirect_uri, &parsed_redirect);
+        }
 
+        if (parsed_redirect.len > 0 &&
+            set_location_header(r, &parsed_redirect) == NGX_OK) {
             http_status = NGX_HTTP_MOVED_TEMPORARILY;
         }
     }

diff --git a/src/nginx/error.h b/src/nginx/error.h
@@ -4,11 +4,14 @@ extern "C" {
 #include <ngx_http.h>
 }
 
+#include "module.h"
+
 #include <weserv/utils/status.h>
 
 namespace weserv::nginx {
 
 ngx_int_t ngx_weserv_return_error(ngx_http_request_t *r,
+                                  ngx_weserv_upstream_ctx_t *upstream_ctx,
                                   api::utils::Status status, ngx_chain_t *out);
 
 }  // namespace weserv::nginx
diff --git a/src/nginx/handler.cpp b/src/nginx/handler.cpp
@@ -40,7 +40,7 @@ ngx_int_t ngx_weserv_request_handler(ngx_http_request_t *r) {
                          Status::ErrorCause::Application};
 
         ngx_chain_t out;
-        if (ngx_weserv_return_error(r, status, &out) != NGX_OK) {
+        if (ngx_weserv_return_error(r, nullptr, status, &out) != NGX_OK) {
             return NGX_ERROR;
         }
 
@@ -82,7 +82,8 @@ ngx_int_t ngx_weserv_request_handler(ngx_http_request_t *r) {
 
     if (rc == NGX_ERROR) {
         ngx_chain_t out;
-        if (ngx_weserv_return_error(r, ctx->response_status, &out) != NGX_OK) {
+        if (ngx_weserv_return_error(r, ctx, ctx->response_status, &out) !=
+            NGX_OK) {
             return NGX_ERROR;
         }
 

diff --git a/src/nginx/module.cpp b/src/nginx/module.cpp
@@ -840,7 +840,8 @@ ngx_int_t ngx_weserv_image_body_filter(ngx_http_request_t *r, ngx_chain_t *in) {
 #endif
         ) {
             ngx_chain_t out;
-            if (ngx_weserv_return_error(r, upstream_ctx->response_status,
+            if (ngx_weserv_return_error(r, upstream_ctx,
+                                        upstream_ctx->response_status,
                                         &out) != NGX_OK) {
                 return NGX_ERROR;
             }
@@ -886,7 +887,8 @@ ngx_int_t ngx_weserv_image_body_filter(ngx_http_request_t *r, ngx_chain_t *in) {
 
     if (!status.ok()) {
         ngx_chain_t error;
-        if (ngx_weserv_return_error(r, status, &error) != NGX_OK) {
+        if (ngx_weserv_return_error(r, upstream_ctx, status, &error) !=
+            NGX_OK) {
             return NGX_ERROR;
         }