Create a group container for macOS sandbox, and on Mac put the Tor data dir in it

2 files changed, 7 insertions, 6 deletions

diff --git a/onionshare/onion.py b/onionshare/onion.py
index 6066f059..f9f551c4 100644
--- a/onionshare/onion.py
+++ b/onionshare/onion.py
@@ -166,7 +166,12 @@ class Onion(object):
                 raise BundledTorNotSupported(strings._('settings_error_bundled_tor_not_supported'))
 
             # Create a torrc for this session
-            self.tor_data_directory = tempfile.TemporaryDirectory()
+            if self.common.platform == 'Darwin':
+                group_container_dir = os.path.expanduser('~/Library/Group Containers/com.micahflee.onionshare')
+                os.makedirs(group_container_dir, exist_ok=True)
+                self.tor_data_directory = tempfile.TemporaryDirectory(dir=group_container_dir)
+            else:
+                self.tor_data_directory = tempfile.TemporaryDirectory()
 
             if self.common.platform == 'Windows':
                 # Windows needs to use network ports, doesn't support unix sockets
diff --git a/onionshare/settings.py b/onionshare/settings.py
index ed827cbd..4a056989 100644
--- a/onionshare/settings.py
+++ b/onionshare/settings.py
@@ -163,11 +163,7 @@ class Settings(object):
         Save settings to file.
         """
         self.common.log('Settings', 'save')
-
-        try:
-            os.makedirs(os.path.dirname(self.filename))
-        except:
-            pass
+        os.makedirs(os.path.dirname(self.filename), exist_ok=True)
         open(self.filename, 'w').write(json.dumps(self._settings))
         self.common.log('Settings', 'save', 'Settings saved in {}'.format(self.filename))