Merge branch '1.5' into 2.0

gns3server/compute/base_node.py

@@ -16,6 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
+import stat
 import logging
 import aiohttp
 import shutil
@@ -230,11 +231,13 @@ class BaseNode:
         """
         Delete the node (including all its files).
         """
+        def set_rw(operation, name, exc):
+            os.chmod(name, stat.S_IWRITE)
 
         directory = self.project.node_working_directory(self)
         if os.path.exists(directory):
             try:
-                yield from wait_run_in_executor(shutil.rmtree, directory)
+                yield from wait_run_in_executor(shutil.rmtree, directory, onerror=set_rw)
             except OSError as e:
                 raise aiohttp.web.HTTPInternalServerError(text="Could not delete the node working directory: {}".format(e))
 

gns3server/compute/docker/docker_vm.py

@@ -85,6 +85,7 @@ class DockerVM(BaseNode):
         self._console_http_path = console_http_path
         self._console_http_port = console_http_port
         self._console_websocket = None
+        self._volumes = []
 
         if adapters is None:
             self.adapters = 1
@@ -135,8 +136,9 @@ class DockerVM(BaseNode):
 
     @start_command.setter
     def start_command(self, command):
-        command = command.strip()
-        if len(command) == 0:
+        if command:
+            command = command.strip()
+        if command is None or len(command) == 0:
             self._start_command = None
         else:
             self._start_command = command
@@ -206,6 +208,8 @@ class DockerVM(BaseNode):
         network_config = self._create_network_config()
         binds.append("{}:/etc/network:rw".format(network_config))
 
+        self._volumes = ["/etc/network"]
+
         volumes = image_infos.get("ContainerConfig", {}).get("Volumes")
         if volumes is None:
             return binds
@@ -213,6 +217,7 @@ class DockerVM(BaseNode):
             source = os.path.join(self.working_dir, os.path.relpath(volume, "/"))
             os.makedirs(source, exist_ok=True)
             binds.append("{}:{}".format(source, volume))
+            self._volumes.append(volume)
 
         return binds
 
@@ -293,6 +298,8 @@ class DockerVM(BaseNode):
 
         # Give the information to the container on how many interface should be inside
         params["Env"].append("GNS3_MAX_ETHERNET=eth{}".format(self.adapters - 1))
+        # Give the information to the container the list of volume path mounted
+        params["Env"].append("GNS3_VOLUMES={}".format(":".join(self._volumes)))
 
         if self._environment:
             params["Env"] += [e.strip() for e in self._environment.split("\n")]
@@ -385,6 +392,25 @@ class DockerVM(BaseNode):
         self._telnet_servers.append((yield from asyncio.start_server(server.run, self._manager.port_manager.console_host, self.aux)))
         log.debug("Docker container '%s' started listen for auxilary telnet on %d", self.name, self.aux)
 
+    @asyncio.coroutine
+    def _fix_permissions(self):
+        """
+        Because docker run as root we need to fix permission and ownership to allow user to interact
+        with it from their filesystem and do operation like file delete
+        """
+        for volume in self._volumes:
+            log.debug("Docker container '{name}' [{image}] fix ownership on {path}".format(
+                name=self._name, image=self._image, path=volume))
+            process = yield from asyncio.subprocess.create_subprocess_exec(
+                "docker",
+                "exec",
+                self._cid,
+                "/gns3/bin/busybox",
+                "sh",
+                "-c",
+                "(/gns3/bin/busybox find \"{path}\" -depth -print0 | /gns3/bin/busybox xargs -0 /gns3/bin/busybox stat -c '%a:%u:%g:%n' > \"{path}/.gns3_perms\") && /gns3/bin/busybox chmod -R u+rX \"{path}\" && /gns3/bin/busybox chown {uid}:{gid} -R \"{path}\"".format(uid=os.getuid(), gid=os.getgid(), path=volume))
+            yield from process.wait()
+
     @asyncio.coroutine
     def _start_vnc(self):
         """
@@ -508,6 +534,8 @@ class DockerVM(BaseNode):
             if state == "paused":
                 yield from self.unpause()
 
+            yield from self._fix_permissions()
+
             # t=5 number of seconds to wait before killing the container
             try:
                 yield from self.manager.query("POST", "containers/{}/stop".format(self._cid), params={"t": 5})

gns3server/compute/docker/resources/init.sh

@@ -28,6 +28,20 @@ if [ ! -d /tmp/gns3/bin ]; then
 	/gns3/bin/busybox --install -s /tmp/gns3/bin
 fi
 
+#  Restore file permission
+for i in $(echo "$GNS3_VOLUMES" | tr ":" "\n")
+do
+    if [ -f "$i/.gns3_perms" ]
+    then
+        while IFS=: read PERMS OWNER GROUP FILE
+        do
+            chmod "$PERMS" "$FILE"
+            chown "${OWNER}:${GROUP}" "$FILE"
+        done < "$i/.gns3_perms"
+    fi
+done
+
+
 # /etc/hosts
 [ -s /etc/hosts ] || cat > /etc/hosts << __EOF__
 127.0.1.1	$HOSTNAME
@@ -60,3 +74,4 @@ ifup -a -f
 # continue normal docker startup
 PATH="$OLD_PATH"
 exec "$@"
+

gns3server/compute/qemu/qemu_vm.py

@@ -28,7 +28,6 @@ import subprocess
 import shlex
 import asyncio
 import socket
-import random
 import gns3server
 
 from gns3server.utils import parse_version
@@ -493,9 +492,10 @@ class QemuVM(BaseNode):
         """
 
         if not mac_address:
-            self._mac_address = "12:34:%02x:%02x:%02x:00" % (random.randint(0, 255), random.randint(0, 255), random.randint(0, 255))
+            # use the node UUID to generate a random MAC address
+            self._mac_address = "00:%s:%s:%s:%s:00" % (self.project.id[-4:-2], self.project.id[-2:], self.id[-4:-2], self.id[-2:])
         else:
-            self._mac_address = mac_address[:8] + ":%02x:%02x:00" % (random.randint(0, 255), random.randint(0, 255))
+            self._mac_address = mac_address
 
         log.info('QEMU VM "{name}" [{id}]: MAC address changed to {mac_addr}'.format(name=self._name,
                                                                                      id=self._id,