From 1362f029b559d8ef3a17b8b5d68df66237792c3b Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Fri, 25 Jun 2021 06:53:41 +0000
Subject: [PATCH] =?UTF-8?q?feat:=20add=20a=20configuration=20option=20to?=
 =?UTF-8?q?=20open=20the=20endpoint=20/uuid=20to=20other=20=E2=80=A6=20(ba?=
 =?UTF-8?q?ckport=20#136)=20(#185)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is an automatic backport of pull request #136 done by [Mergify](https://mergify.io).
Cherry-pick of 9d7170275ecedc7a3150cbc4e20d1574151f6d25 has failed:
```
On branch mergify/bp/release_0.8/pr-136
Your branch is up to date with 'origin/release_0.8'.

You are currently cherry-picking commit 9d71702.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   config/nginx.conf

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   config/config.ini.custom

```


To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

---


<details>
<summary>Mergify commands and options</summary>

<br />

More conditions and actions can be found in the [documentation](https://docs.mergify.io/).

You can also trigger Mergify actions by commenting on this pull request:

- `@Mergifyio refresh` will re-evaluate the rules
- `@Mergifyio rebase` will rebase this PR on its base branch
- `@Mergifyio update` will merge the base branch into this PR
- `@Mergifyio backport <destination>` will backport this PR on `<destination>` branch

Additionally, on Mergify [dashboard](https://dashboard.mergify.io/) you can:

- look at your merge queues
- generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/
</details>
---
 config/config.ini | 7 +++++++
 config/nginx.conf | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/config/config.ini b/config/config.ini
index a4880ed..43cce89 100644
--- a/config/config.ini
+++ b/config/config.ini
@@ -151,6 +151,13 @@ storage_min_delete_depth=0
 # (see http://nginx.org/en/docs/http/ngx_http_autoindex_module.html)
 storage_autoindex=1
 
+# extra networks allowed on /uuid endpoint (in addition to 127.0.0.1/32)
+# (coma separated list)
+# ("null" => no extra uuid allowed)
+# example : 
+# uuid_endpoint_extra_allows=5.6.0.0/16,1.2.3.4/32
+uuid_endpoint_extra_allows=null
+
 
 #######################
 ##### AUTORESTART #####
diff --git a/config/nginx.conf b/config/nginx.conf
index b02ee15..f8eafa9 100644
--- a/config/nginx.conf
+++ b/config/nginx.conf
@@ -40,6 +40,13 @@ http {
         # FIXME: rename this in __uuid
         location = /uuid {
             allow 127.0.0.1/32;
+        {% if MFBASE_NGINX_UUID_ENDPOINT_EXTRA_ALLOWS != "null" -%}
+            {% for ALLOW in MFBASE_NGINX_UUID_ENDPOINT_EXTRA_ALLOWS.split(',') %}
+                {%- if ALLOW != "" -%}
+                    allow {{ALLOW}};
+                {% endif %}
+            {%- endfor -%}
+        {%- endif -%}
             deny all;
             echo "{{UUID}}";
             access_log off;