Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-01-19 03:01:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

In Tails OnionShare now creates HS directory in /var/lib/tor, to obey AppArmor rules (fixes #166)

Browse Source
This commit is contained in:
Micah Lee 2014-12-10 02:09:10 +00:00
parent ee98e1b024
commit 21e2546435
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
onionshare/onionshare.py
View File

@ -101,11 +101,13 @@ class OnionShare(object):
args = ['/usr/bin/gksudo', '-D', 'OnionShare', '--', '/usr/bin/onionshare'] args = ['/usr/bin/gksudo', '-D', 'OnionShare', '--', '/usr/bin/onionshare']
else: else:
args = ['/usr/bin/sudo', '--', '/usr/bin/onionshare'] args = ['/usr/bin/sudo', '--', '/usr/bin/onionshare']
print "Executing: {0}".format(args+[str(self.port)])
p = subprocess.Popen(args+[str(self.port)], stderr=subprocess.PIPE, stdout=subprocess.PIPE) p = subprocess.Popen(args+[str(self.port)], stderr=subprocess.PIPE, stdout=subprocess.PIPE)
stdout = p.stdout.read(22) # .onion URLs are 22 chars long stdout = p.stdout.read(22) # .onion URLs are 22 chars long
if stdout: if stdout:
self.onion_host = stdout self.onion_host = stdout
print 'Got onion_host: {0}'.format(self.onion_host)
else: else:
if p.poll() == -1: if p.poll() == -1:
raise TailsError(o.stderr.read()) raise TailsError(o.stderr.read())
@ -118,7 +120,18 @@ class OnionShare(object):
else: else:
# come up with a hidden service directory name # come up with a hidden service directory name
self.hidserv_dir = tempfile.mkdtemp() if helpers.get_platform() == 'Tails':
# need to create HS directory in /var/lib/tor because of AppArmor rules included in Tails
self.hidserv_dir = tempfile.mkdtemp(dir='/var/lib/tor')
# change owner to debian-tor
import pwd
import grp
uid = pwd.getpwnam("debian-tor").pw_uid
gid = grp.getgrnam("debian-tor").gr_gid
os.chown(self.hidserv_dir, uid, gid)
else:
self.hidserv_dir = tempfile.mkdtemp()
self.cleanup_filenames.append(self.hidserv_dir) self.cleanup_filenames.append(self.hidserv_dir)
# connect to the tor controlport # connect to the tor controlport