From e064ab554d74069f4ab54d94d19b75618ef33bf6 Mon Sep 17 00:00:00 2001
From: Brenner-Bot <dev@brenner.tech>
Date: Thu, 16 Jun 2022 15:01:23 +0000
Subject: [PATCH] :tada: Release of add-on Cloudflared 2.0.2

---
 README.md                |  6 +++---
 cloudflared/CHANGELOG.md | 10 +++++-----
 cloudflared/apparmor.txt | 42 ++++++++++++++++++++++++++++++++--------
 cloudflared/config.yaml  |  2 +-
 4 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index 19cac9d..bb59ba7 100644
--- a/README.md
+++ b/README.md
@@ -86,10 +86,10 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
-[addon-cloudflared]: https://github.com/brenner-tobias/addon-cloudflared/tree/v2.0.1
-[addon-doc-cloudflared]: https://github.com/brenner-tobias/addon-cloudflared/blob/v2.0.1/README.md
+[addon-cloudflared]: https://github.com/brenner-tobias/addon-cloudflared/tree/v2.0.2
+[addon-doc-cloudflared]: https://github.com/brenner-tobias/addon-cloudflared/blob/v2.0.2/README.md
 [cloudflared-issue]: https://github.com/brenner-tobias/addon-cloudflared/issues
-[cloudflared-version-shield]: https://img.shields.io/badge/version-v2.0.1-blue.svg
+[cloudflared-version-shield]: https://img.shields.io/badge/version-v2.0.2-blue.svg
 [cloudflared-aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
 [cloudflared-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
 [cloudflared-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
diff --git a/cloudflared/CHANGELOG.md b/cloudflared/CHANGELOG.md
index 315f4eb..4ffe49e 100644
--- a/cloudflared/CHANGELOG.md
+++ b/cloudflared/CHANGELOG.md
@@ -1,10 +1,10 @@
 ## What’s changed
-## 📚 Documentation
 
-- Add Troubleshooting for 400: Bad Request error @elcajon (#105)
+## 🐛 Bug fixes
+
+- 🐛 Update AppArmor for Cloudflared service & s6-overlay v3 @elcajon (#108)
 
 ## ⬆️ Dependency updates
 
-- ⬆️ Update yq to 4.14.1-r2 @elcajon (#103)
-- ℹ️ Update Cloudflared to version 2022.5.3 @github-actions (#102)
-- ⬆️ Update base image to 11.1.2 @elcajon (#104)
+- ⬆️ Update Base image to v.12.0.0 @elcajon (#106)
+- ⬆️ Update Cloudflared to version 2022.6.1 @github-actions (#109)
diff --git a/cloudflared/apparmor.txt b/cloudflared/apparmor.txt
index 559492a..75926db 100644
--- a/cloudflared/apparmor.txt
+++ b/cloudflared/apparmor.txt
@@ -5,26 +5,52 @@ profile cloudflared flags=(attach_disconnected,mediate_deleted) {
 
   # Capabilities
   file,
-  signal,
+  signal (send) set=(kill,term,int,hup,cont),
 
-  # S6-Overlay
+  # S6-Overlay from HA OS default apparmor profile
+  /init ix,
+  /bin/** ix,
+  /usr/bin/** ix,
+  /run/{s6,s6-rc*,service}/** ix,
+  /package/** ix,
+  /command/** ix,
   /etc/services.d/** rwix,
   /etc/cont-init.d/** rwix,
+  /etc/cont-finish.d/** rwix,
+  /run/{,**} rwk,
+  /dev/tty rw,
+  
+  # S6-Overlay from cloudflared add-on
+  /etc/s6-overlay/** rwix,
 
   # Bashio
   /usr/lib/bashio/** ix,
-  /tmp/** rw,
-
-  # Access to cloudflared files
-  /root/.cloudflared/** rw,
+  /tmp/** rwk,
+  
+  # Access to options.json and other files within your addon
+  /data/** rw,
 
   # Start new profile for cloudflared service
-  cloudflared cx,
+  #/usr/bin/cloudflared cx -> cloudflared,
 
   profile cloudflared flags=(attach_disconnected,mediate_deleted) {
     #include <abstractions/base>
 
+    # Access to options.json and other files within your addon
+    /data/** rw,
+
+    # Access to mapped volumes specified in config.json
+    /share/** rw,
+    /config/** rw,
+    /ssl/** rw,
+    
+    # Access to add-on generated config.yaml
+    /tmp/** rw,
+    
+    # Access required for service functionality
+    /usr/bin/cloudflared r,
+
     # Receive signals from S6-Overlay
     signal receive,
   }
-}
\ No newline at end of file
+}
diff --git a/cloudflared/config.yaml b/cloudflared/config.yaml
index b180525..3876f32 100644
--- a/cloudflared/config.yaml
+++ b/cloudflared/config.yaml
@@ -42,4 +42,4 @@ schema:
   - str?
 slug: cloudflared
 url: https://github.com/brenner-tobias/addon-cloudflared/
-version: 2.0.1
+version: 2.0.2