Merge lp:~sergiusens/snapcraft/1500505 into lp:~snappy-dev/snapcraft/core

[Sergio Schvezov]

Copy links to packages we did not download and also untarring not world writable.

I'm not sure I like this, if you look at the bug, most of the dangling symlinks are from libraries provided by libc6.

The one I haven't figured out how it go onto my system is the target for /usr/lib/jvm/java-7-openjdk-amd64/jre/lib/security/cacerts as no package owns it.

[John Lenton (chipaca)]

review: Approve

[Snappy Tarmac (snappydevtarmac)]

The attempt to merge lp:~sergiusens/snapcraft/1500505 into lp:snapcraft failed. Below is the output from the failed tests.

name: # the name of the snap
version: # the version of the snap
# The vendor for the snap (replace 'Vendor <email address hidden>')
vendor: Vendor <email address hidden>
summary: # 79 char long summary
description: # A longer description for the snap
icon: # A path to an icon for the package
cp --preserve=all -R zzz /tmp/tmpfqjb5zom/parts/copy/install/zzz
cp --preserve=all -R src /tmp/tmp4yykp3c4/parts/copy/install/dst
cp --preserve=all -R src /tmp/tmpo047wt4b/parts/copy/install/dir/dst

...................................Warning: unable to find "test_relexepath" in the path
............../tmp/tmp71nc0tyw/abs-to-b will be a dangling symlink
F.....................................................
======================================================================
FAIL: test_fix_symlinks (snapcraft.tests.test_repo.UbuntuTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/tmp/tarmac/branch.lg1XOE/snapcraft/tests/test_repo.py", line 84, in test_fix_symlinks
    self.assertEqual(os.readlink(tempdir + '/abs-to-b'), '/b')
AssertionError: 'b' != '/b'
- b
+ /b
? +

----------------------------------------------------------------------
Ran 103 tests in 2.933s

FAILED (failures=1)

[lp:~sergiusens/snapcraft/1500505]

235. By Sergio Schvezov on 2015-10-08

fixing logic

=== modified file 'plugins/jdk.yaml'
--- plugins/jdk.yaml	2015-07-20 21:11:39 +0000
+++ plugins/jdk.yaml	2015-10-08 19:26:03 +0000
@@ -0,0 +1,2 @@
+build-packages:
+  - ca-certificates-java

=== modified file 'snapcraft/repo.py'
--- snapcraft/repo.py	2015-10-05 16:56:10 +0000
+++ snapcraft/repo.py	2015-10-08 19:26:03 +0000
@@ -17,9 +17,11 @@
 import apt
 import glob
 import itertools
+import logging
 import os
 import platform
 import string
+import shutil
 import subprocess
 import urllib
 import urllib.request
@@ -28,6 +30,8 @@
 
 import snapcraft.common
 
+logger = logging.getLogger(__name__)
+
 _DEFAULT_SOURCES = \
     '''deb http://${prefix}.ubuntu.com/${suffix}/ ${release} main restricted
 deb http://${prefix}.ubuntu.com/${suffix}/ ${release}-updates main restricted
@@ -232,6 +236,36 @@
             path = os.path.join(root, entry)
             if os.path.islink(path) and os.path.isabs(os.readlink(path)):
                 target = os.path.join(debdir, os.readlink(path)[1:])
-                if os.path.exists(target):
-                    os.remove(path)
-                    os.symlink(os.path.relpath(target, root), path)
+                if _skip_link(os.readlink(path)):
+                    logger.debug('Skipping {}'.format(target))
+                    continue
+                if not os.path.exists(target):
+                    if not _try_copy_local(path, target):
+                        continue
+                os.remove(path)
+                os.symlink(os.path.relpath(target, root), path)
+
+
+_skip_list = None
+
+
+def _skip_link(target):
+    global _skip_list
+    if not _skip_list:
+        output = snapcraft.common.run_output(['dpkg', '-L', 'libc6']).split()
+        _skip_list = [i for i in output if 'lib' in i]
+
+    return target in _skip_list
+
+
+def _try_copy_local(path, target):
+    real_path = os.path.realpath(path)
+    if os.path.exists(real_path):
+        logger.warning(
+            'Copying needed target link from the system {}'.format(real_path))
+        shutil.copyfile(os.readlink(path), target)
+        return True
+    else:
+        logger.warning(
+            '{} will be a dangling symlink'.format(path))
+        return False

=== modified file 'snapcraft/sources.py'
--- snapcraft/sources.py	2015-10-05 16:56:10 +0000
+++ snapcraft/sources.py	2015-10-08 19:26:03 +0000
@@ -193,7 +193,7 @@
                     m.name = re.sub(r'^(\.{0,2}/)*', r'', m.name)
                     # We mask all files to be writable to be able to easily
                     # extract on top.
-                    m.mode = m.mode | 0o222
+                    m.mode = m.mode | 0o200
                     yield m
 
             tar.extractall(members=filter_members(tar), path=dst)

=== modified file 'snapcraft/tests/test_repo.py'
--- snapcraft/tests/test_repo.py	2015-10-05 16:56:10 +0000
+++ snapcraft/tests/test_repo.py	2015-10-08 19:26:03 +0000
@@ -14,6 +14,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+import fixtures
+import logging
 import os
 import tempfile
 import unittest.mock
@@ -64,6 +66,8 @@
         self.assertFalse(mock_cc.called)
 
     def test_fix_symlinks(self):
+        fake_logger = fixtures.FakeLogger(level=logging.ERROR)
+        self.useFixture(fake_logger)
         tempdirObj = tempfile.TemporaryDirectory()
         self.addCleanup(tempdirObj.cleanup)
         tempdir = tempdirObj.name