From ed08570377791c4cf7f0670a509f9d507175faed Mon Sep 17 00:00:00 2001 From: avoidr Date: Mon, 30 Nov 2015 20:50:45 +0100 Subject: [PATCH 1/5] add google-chrome-stable.profile --- Makefile.in | 1 + etc/google-chrome-stable.profile | 3 +++ platform/debian/conffiles | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 etc/google-chrome-stable.profile diff --git a/Makefile.in b/Makefile.in index 3ae71a230..e6d790a1f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -85,6 +85,7 @@ realinstall: install -c -m 0644 .etc/chromium-browser.profile $(DESTDIR)/$(sysconfdir)/firejail/. install -c -m 0644 .etc/chromium.profile $(DESTDIR)/$(sysconfdir)/firejail/. install -c -m 0644 .etc/google-chrome.profile $(DESTDIR)/$(sysconfdir)/firejail/. + install -c -m 0644 .etc/google-chrome-stable.profile $(DESTDIR)/$(sysconfdir)/firejail/. install -c -m 0644 .etc/disable-mgmt.inc $(DESTDIR)/$(sysconfdir)/firejail/. install -c -m 0644 .etc/disable-secret.inc $(DESTDIR)/$(sysconfdir)/firejail/. install -c -m 0644 .etc/disable-common.inc $(DESTDIR)/$(sysconfdir)/firejail/. diff --git a/etc/google-chrome-stable.profile b/etc/google-chrome-stable.profile new file mode 100644 index 000000000..4cdc098d1 --- /dev/null +++ b/etc/google-chrome-stable.profile @@ -0,0 +1,3 @@ +# Chromium browser profile +include /etc/firejail/chromium.profile + diff --git a/platform/debian/conffiles b/platform/debian/conffiles index 6aeb9d5f4..97d8fae72 100644 --- a/platform/debian/conffiles +++ b/platform/debian/conffiles @@ -1,13 +1,14 @@ /etc/firejail/evince.profile /etc/firejail/disable-secret.inc /etc/firejail/chromium.profile +/etc/firejail/chromium-browser.profile /etc/firejail/google-chrome.profile +/etc/firejail/google-chrome-stable.profile /etc/firejail/midori.profile /etc/firejail/icedove.profile /etc/firejail/iceweasel.profile /etc/firejail/dropbox.profile /etc/firejail/login.users -/etc/firejail/chromium-browser.profile /etc/firejail/disable-mgmt.inc /etc/firejail/firefox.profile /etc/firejail/opera.profile From 960d2e22f8329e931d137af4dcd52c5aadbcb646 Mon Sep 17 00:00:00 2001 From: avoidr Date: Mon, 30 Nov 2015 23:48:25 +0100 Subject: [PATCH 2/5] add google-chrome-beta.profile --- Makefile.in | 1 + etc/google-chrome-beta.profile | 3 +++ platform/debian/conffiles | 1 + 3 files changed, 5 insertions(+) create mode 100644 etc/google-chrome-beta.profile diff --git a/Makefile.in b/Makefile.in index e6d790a1f..e4ca54109 100644 --- a/Makefile.in +++ b/Makefile.in @@ -86,6 +86,7 @@ realinstall: install -c -m 0644 .etc/chromium.profile $(DESTDIR)/$(sysconfdir)/firejail/. install -c -m 0644 .etc/google-chrome.profile $(DESTDIR)/$(sysconfdir)/firejail/. install -c -m 0644 .etc/google-chrome-stable.profile $(DESTDIR)/$(sysconfdir)/firejail/. + install -c -m 0644 .etc/google-chrome-beta.profile $(DESTDIR)/$(sysconfdir)/firejail/. install -c -m 0644 .etc/disable-mgmt.inc $(DESTDIR)/$(sysconfdir)/firejail/. install -c -m 0644 .etc/disable-secret.inc $(DESTDIR)/$(sysconfdir)/firejail/. install -c -m 0644 .etc/disable-common.inc $(DESTDIR)/$(sysconfdir)/firejail/. diff --git a/etc/google-chrome-beta.profile b/etc/google-chrome-beta.profile new file mode 100644 index 000000000..4cdc098d1 --- /dev/null +++ b/etc/google-chrome-beta.profile @@ -0,0 +1,3 @@ +# Chromium browser profile +include /etc/firejail/chromium.profile + diff --git a/platform/debian/conffiles b/platform/debian/conffiles index 97d8fae72..6decfb9cf 100644 --- a/platform/debian/conffiles +++ b/platform/debian/conffiles @@ -4,6 +4,7 @@ /etc/firejail/chromium-browser.profile /etc/firejail/google-chrome.profile /etc/firejail/google-chrome-stable.profile +/etc/firejail/google-chrome-beta.profile /etc/firejail/midori.profile /etc/firejail/icedove.profile /etc/firejail/iceweasel.profile From 69c2dacb30cf3545ee1194de4fe5ba89e3512310 Mon Sep 17 00:00:00 2001 From: avoidr Date: Mon, 30 Nov 2015 23:51:47 +0100 Subject: [PATCH 3/5] whitelist ~/.conf/google-chrome-beta --- etc/chromium.profile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/etc/chromium.profile b/etc/chromium.profile index 981c61339..faeb75e62 100644 --- a/etc/chromium.profile +++ b/etc/chromium.profile @@ -1,6 +1,7 @@ # Chromium browser profile noblacklist ${HOME}/.config/chromium noblacklist ${HOME}/.config/google-chrome +noblacklist ${HOME}/.config/google-chrome-beta include /etc/firejail/disable-mgmt.inc include /etc/firejail/disable-secret.inc include /etc/firejail/disable-common.inc @@ -13,5 +14,6 @@ netfilter whitelist ${DOWNLOADS} whitelist ~/.config/chromium whitelist ~/.config/google-chrome +whitelist ~/.config/google-chrome-beta include /etc/firejail/whitelist-common.inc From c128d90100e556f1a16a7d56201fdfeace1ebe5a Mon Sep 17 00:00:00 2001 From: avoidr Date: Mon, 30 Nov 2015 23:56:40 +0100 Subject: [PATCH 4/5] add google-chrome-unstable.profile --- Makefile.in | 1 + etc/chromium.profile | 2 ++ etc/google-chrome-unstable.profile | 3 +++ platform/debian/conffiles | 1 + 4 files changed, 7 insertions(+) create mode 100644 etc/google-chrome-unstable.profile diff --git a/Makefile.in b/Makefile.in index e4ca54109..143ac5975 100644 --- a/Makefile.in +++ b/Makefile.in @@ -87,6 +87,7 @@ realinstall: install -c -m 0644 .etc/google-chrome.profile $(DESTDIR)/$(sysconfdir)/firejail/. install -c -m 0644 .etc/google-chrome-stable.profile $(DESTDIR)/$(sysconfdir)/firejail/. install -c -m 0644 .etc/google-chrome-beta.profile $(DESTDIR)/$(sysconfdir)/firejail/. + install -c -m 0644 .etc/google-chrome-unstable.profile $(DESTDIR)/$(sysconfdir)/firejail/. install -c -m 0644 .etc/disable-mgmt.inc $(DESTDIR)/$(sysconfdir)/firejail/. install -c -m 0644 .etc/disable-secret.inc $(DESTDIR)/$(sysconfdir)/firejail/. install -c -m 0644 .etc/disable-common.inc $(DESTDIR)/$(sysconfdir)/firejail/. diff --git a/etc/chromium.profile b/etc/chromium.profile index faeb75e62..c86c5d9d0 100644 --- a/etc/chromium.profile +++ b/etc/chromium.profile @@ -2,6 +2,7 @@ noblacklist ${HOME}/.config/chromium noblacklist ${HOME}/.config/google-chrome noblacklist ${HOME}/.config/google-chrome-beta +noblacklist ${HOME}/.config/google-chrome-unstable include /etc/firejail/disable-mgmt.inc include /etc/firejail/disable-secret.inc include /etc/firejail/disable-common.inc @@ -15,5 +16,6 @@ whitelist ${DOWNLOADS} whitelist ~/.config/chromium whitelist ~/.config/google-chrome whitelist ~/.config/google-chrome-beta +whitelist ~/.config/google-chrome-unstable include /etc/firejail/whitelist-common.inc diff --git a/etc/google-chrome-unstable.profile b/etc/google-chrome-unstable.profile new file mode 100644 index 000000000..4cdc098d1 --- /dev/null +++ b/etc/google-chrome-unstable.profile @@ -0,0 +1,3 @@ +# Chromium browser profile +include /etc/firejail/chromium.profile + diff --git a/platform/debian/conffiles b/platform/debian/conffiles index 6decfb9cf..ea17a121e 100644 --- a/platform/debian/conffiles +++ b/platform/debian/conffiles @@ -5,6 +5,7 @@ /etc/firejail/google-chrome.profile /etc/firejail/google-chrome-stable.profile /etc/firejail/google-chrome-beta.profile +/etc/firejail/google-chrome-unstable.profile /etc/firejail/midori.profile /etc/firejail/icedove.profile /etc/firejail/iceweasel.profile From 5c66c4e41cebea3a83077590404b98efb05ee986 Mon Sep 17 00:00:00 2001 From: avoidr Date: Tue, 1 Dec 2015 00:16:56 +0100 Subject: [PATCH 5/5] create chromium-common.profile --- etc/chromium-browser.profile | 1 - etc/chromium-common.profile | 12 ++++++++++++ etc/chromium.profile | 19 +------------------ etc/google-chrome-beta.profile | 5 +++-- etc/google-chrome-stable.profile | 5 +++-- etc/google-chrome-unstable.profile | 5 +++-- etc/google-chrome.profile | 5 +++-- 7 files changed, 25 insertions(+), 27 deletions(-) create mode 100644 etc/chromium-common.profile diff --git a/etc/chromium-browser.profile b/etc/chromium-browser.profile index 4cdc098d1..d989b736b 100644 --- a/etc/chromium-browser.profile +++ b/etc/chromium-browser.profile @@ -1,3 +1,2 @@ # Chromium browser profile include /etc/firejail/chromium.profile - diff --git a/etc/chromium-common.profile b/etc/chromium-common.profile new file mode 100644 index 000000000..25eab0707 --- /dev/null +++ b/etc/chromium-common.profile @@ -0,0 +1,12 @@ +# Chromium browser profile +include /etc/firejail/disable-mgmt.inc +include /etc/firejail/disable-secret.inc +include /etc/firejail/disable-common.inc + +# chromium is distributed with a perl script on Arch +# include /etc/firejail/disable-devel.inc +# + +netfilter +whitelist ${DOWNLOADS} +include /etc/firejail/whitelist-common.inc diff --git a/etc/chromium.profile b/etc/chromium.profile index c86c5d9d0..c3a7a186c 100644 --- a/etc/chromium.profile +++ b/etc/chromium.profile @@ -1,21 +1,4 @@ # Chromium browser profile noblacklist ${HOME}/.config/chromium -noblacklist ${HOME}/.config/google-chrome -noblacklist ${HOME}/.config/google-chrome-beta -noblacklist ${HOME}/.config/google-chrome-unstable -include /etc/firejail/disable-mgmt.inc -include /etc/firejail/disable-secret.inc -include /etc/firejail/disable-common.inc - -# chromium is distributed with a perl script on Arch -# include /etc/firejail/disable-devel.inc -# - -netfilter -whitelist ${DOWNLOADS} whitelist ~/.config/chromium -whitelist ~/.config/google-chrome -whitelist ~/.config/google-chrome-beta -whitelist ~/.config/google-chrome-unstable -include /etc/firejail/whitelist-common.inc - +include /etc/firejail/chromium-common.profile diff --git a/etc/google-chrome-beta.profile b/etc/google-chrome-beta.profile index 4cdc098d1..0f7078adc 100644 --- a/etc/google-chrome-beta.profile +++ b/etc/google-chrome-beta.profile @@ -1,3 +1,4 @@ # Chromium browser profile -include /etc/firejail/chromium.profile - +noblacklist ${HOME}/.config/google-chrome-beta +whitelist ~/.config/google-chrome-beta +include /etc/firejail/chromium-common.profile diff --git a/etc/google-chrome-stable.profile b/etc/google-chrome-stable.profile index 4cdc098d1..3cc58c4d2 100644 --- a/etc/google-chrome-stable.profile +++ b/etc/google-chrome-stable.profile @@ -1,3 +1,4 @@ # Chromium browser profile -include /etc/firejail/chromium.profile - +noblacklist ${HOME}/.config/google-chrome +whitelist ~/.config/google-chrome +include /etc/firejail/chromium-common.profile diff --git a/etc/google-chrome-unstable.profile b/etc/google-chrome-unstable.profile index 4cdc098d1..db184419d 100644 --- a/etc/google-chrome-unstable.profile +++ b/etc/google-chrome-unstable.profile @@ -1,3 +1,4 @@ # Chromium browser profile -include /etc/firejail/chromium.profile - +noblacklist ${HOME}/.config/google-chrome-unstable +whitelist ~/.config/google-chrome-unstable +include /etc/firejail/chromium-common.profile diff --git a/etc/google-chrome.profile b/etc/google-chrome.profile index 4cdc098d1..3cc58c4d2 100644 --- a/etc/google-chrome.profile +++ b/etc/google-chrome.profile @@ -1,3 +1,4 @@ # Chromium browser profile -include /etc/firejail/chromium.profile - +noblacklist ${HOME}/.config/google-chrome +whitelist ~/.config/google-chrome +include /etc/firejail/chromium-common.profile