Client systray support

CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright © 2017-2018 Canonical Ltd.
+# Copyright © 2017-2019 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
@@ -11,8 +11,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Authored by: Alberto Aguirre <[email protected]>
 
 cmake_minimum_required(VERSION 3.1)
 
@@ -44,8 +42,7 @@ endif()
 add_subdirectory(3rd-party)
 
 # Qt config
-find_package(Qt5Core REQUIRED)
-find_package(Qt5Network REQUIRED)
+find_package(Qt5 COMPONENTS Core Network Widgets REQUIRED)
 
 function(determine_version OUTPUT_VARIABLE)
   execute_process(COMMAND git describe --exact

include/multipass/cli/client_common.h

@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2019 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef MULTIPASS_CLIENT_COMMON_H
+#define MULTIPASS_CLIENT_COMMON_H
+
+#include <grpcpp/grpcpp.h>
+
+#include <multipass/cert_provider.h>
+#include <multipass/cli/return_codes.h>
+#include <multipass/rpc/multipass.grpc.pb.h>
+#include <multipass/rpc_connection_type.h>
+#include <multipass/ssl_cert_provider.h>
+
+#include <memory>
+#include <string>
+
+namespace multipass
+{
+namespace cmd
+{
+multipass::ReturnCode standard_failure_handler_for(const std::string& command, std::ostream& cerr,
+                                                   const grpc::Status& status,
+                                                   const std::string& error_details = std::string());
+bool update_available(const UpdateInfo& update_info);
+}
+
+namespace client
+{
+std::shared_ptr<grpc::Channel> make_channel(const std::string& server_address, RpcConnectionType conn_type,
+                                            CertProvider& cert_provider);
+std::string get_server_address();
+std::unique_ptr<SSLCertProvider> get_cert_provider();
+}
+} // namespace multipass
+#endif // MULTIPASS_CLIENT_COMMON_H

include/multipass/cli/client_platform.h

@@ -32,6 +32,7 @@ namespace platform
 void parse_transfer_entry(const QString& entry, QString& path, QString& instance_name);
 int getuid();
 int getgid();
+void open_multipass_shell(const QString& instance_name);
 }
 }
 }

include/multipass/cli/command.h

@@ -41,6 +41,11 @@ class Command
 {
 public:
     using UPtr = std::unique_ptr<Command>;
+    Command(grpc::Channel& channel, Rpc::Stub& stub, std::ostream& cout, std::ostream& cerr)
+        : rpc_channel{&channel}, stub{&stub}, cout{cout}, cerr{cerr}
+    {
+    }
+
     Command(grpc::Channel& channel, Rpc::Stub& stub, Terminal* term)
         : rpc_channel{&channel}, stub{&stub}, term{term}, cout{term->cout()}, cerr{term->cerr()}
     {

snap/gui/multipass-gui.desktop

@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Multipass
+Exec=multipass.gui
+Icon=/snap/multipass/current/meta/gui/multipass-gui.png
+Type=Application
+Terminal=false
+Categories=Utility;
+

snap/snapcraft.yaml

@@ -28,6 +28,12 @@ apps:
       QT_PLUGIN_PATH: $SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/qt5/plugins
     command: bin/multipass
     completer: etc/bash_completion.d/snap.multipass
+  gui:
+    environment:
+      LD_LIBRARY_PATH: $SNAP/lib:$SNAP/lib/$SNAPCRAFT_ARCH_TRIPLET:$SNAP/usr/lib:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET
+      PATH: $SNAP/usr/sbin:$SNAP/usr/bin:$SNAP/sbin:$SNAP/bin:$PATH
+      QT_PLUGIN_PATH: $SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/qt5/plugins
+    command: bin/multipass-gui
   libvirt-bin:
     command: bin/launch-libvirtd
     environment:
@@ -117,6 +123,26 @@ parts:
     stage-packages:
     - libproxy1v5
 
+  libqt5gui5:
+    plugin: dump
+    source:
+    - on amd64: http://archive.ubuntu.com/ubuntu/pool/main/q/qtbase-opensource-src/libqt5gui5_5.9.5+dfsg-0ubuntu1_amd64.deb
+    - on i386: http://archive.ubuntu.com/ubuntu/pool/main/q/qtbase-opensource-src/libqt5gui5_5.9.5+dfsg-0ubuntu1_i386.deb
+    - on armhf: http://ports.ubuntu.com/ubuntu-ports/pool/main/q/qtbase-opensource-src/libqt5gui5_5.9.5+dfsg-0ubuntu1_armhf.deb
+    - on arm64: http://ports.ubuntu.com/ubuntu-ports/pool/main/q/qtbase-opensource-src/libqt5gui5_5.9.5+dfsg-0ubuntu1_arm64.deb
+    source-type: deb
+    stage-packages:
+    - mesa-common-dev
+
+  libqt5widgets5:
+    plugin: dump
+    source:
+    - on amd64: http://archive.ubuntu.com/ubuntu/pool/main/q/qtbase-opensource-src/libqt5widgets5_5.9.5+dfsg-0ubuntu1_amd64.deb
+    - on i386: http://archive.ubuntu.com/ubuntu/pool/main/q/qtbase-opensource-src/libqt5widgets5_5.9.5+dfsg-0ubuntu1_i386.deb
+    - on armhf: http://ports.ubuntu.com/ubuntu-ports/pool/main/q/qtbase-opensource-src/libqt5widgets5_5.9.5+dfsg-0ubuntu1_armhf.deb
+    - on arm64: http://ports.ubuntu.com/ubuntu-ports/pool/main/q/qtbase-opensource-src/libqt5widgets5_5.9.5+dfsg-0ubuntu1_arm64.deb
+    source-type: deb
+
   libicu:
     plugin: dump
     source:
@@ -133,6 +159,34 @@ parts:
     - on i386: http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.0g-2ubuntu4.3_i386.deb
     - on armhf: http://ports.ubuntu.com/ubuntu-ports/pool/main/o/openssl/libssl1.1_1.1.0g-2ubuntu4.3_armhf.deb
     - on arm64: http://ports.ubuntu.com/ubuntu-ports/pool/main/o/openssl/libssl1.1_1.1.0g-2ubuntu4.3_arm64.deb
+
+  libharfbuzz0b:
+    plugin: dump
+    source:
+    - on amd64: http://archive.ubuntu.com/ubuntu/pool/main/h/harfbuzz/libharfbuzz0b_1.7.2-1ubuntu1_amd64.deb
+    - on i386: http://archive.ubuntu.com/ubuntu/pool/main/h/harfbuzz/libharfbuzz0b_1.7.2-1ubuntu1_i386.deb
+    - on armhf: http://ports.ubuntu.com/ubuntu-ports/pool/main/h/harfbuzz/libharfbuzz0b_1.7.2-1ubuntu1_armhf.deb
+    - on arm64: http://ports.ubuntu.com/ubuntu-ports/pool/main/h/harfbuzz/libharfbuzz0b_1.7.2-1ubuntu1_arm64.deb
+    source-type: deb
+    stage-packages:
+    - libgraphite2-3
+
+  libfreetype6:
+    plugin: dump
+    source:
+    - on amd64: http://archive.ubuntu.com/ubuntu/pool/main/f/freetype/libfreetype6_2.8.1-2ubuntu2_amd64.deb
+    - on i386: http://archive.ubuntu.com/ubuntu/pool/main/f/freetype/libfreetype6_2.8.1-2ubuntu2_i386.deb
+    - on armhf: http://ports.ubuntu.com/ubuntu-ports/pool/main/f/freetype/libfreetype6_2.8.1-2ubuntu2_armhf.deb
+    - on arm64: http://ports.ubuntu.com/ubuntu-ports/pool/main/f/freetype/libfreetype6_2.8.1-2ubuntu2_arm64.deb
+    source-type: deb
+
+  libxcb-xinerama0:
+    plugin: dump
+    source:
+    - on amd64: http://archive.ubuntu.com/ubuntu/pool/main/libx/libxcb/libxcb-xinerama0_1.11.1-1ubuntu1_amd64.deb
+    - on i386: http://archive.ubuntu.com/ubuntu/pool/main/libx/libxcb/libxcb-xinerama0_1.11.1-1ubuntu1_i386.deb
+    - on armhf: http://archive.ubuntu.com/ubuntu/pool/main/libx/libxcb/libxcb-xinerama0_1.11.1-1ubuntu1_armhf.deb
+    - on arm64: http://archive.ubuntu.com/ubuntu/pool/main/libx/libxcb/libxcb-xinerama0_1.11.1-1ubuntu1_arm64.deb
     source-type: deb
 
   multipass:
@@ -141,14 +195,22 @@ parts:
     - qtbase5-dev-tools
     - libqt5core5a
     - libqt5network5
+    - libqt5gui5
+    - libqt5widgets5
+    - libharfbuzz0b
+    - libfreetype6
     - libvirt
+    - libxcb-xinerama0
     plugin: cmake
     build-packages:
     - build-essential
     - cmake-extras
     - git
     - golang
     - libsystemd-dev
+    stage-packages:
+    - libgl1
+    - libpng16-16
     source: .
     configflags:
     - -DCMAKE_BUILD_TYPE=RelWithDebInfo
@@ -265,6 +327,18 @@ parts:
     - iputils-ping
     - libatm1
 
+  xterm:
+    plugin: nil
+    override-pull: ""
+    stage-packages:
+    - xterm
+    stage:
+    - -usr/lib/x86_64-linux-gnu/libfreetype.so.6
+    - -usr/share/doc/libfreetype6/FTL.TXT.gz
+    - -usr/share/doc/libfreetype6/TODO
+    - -usr/share/doc/libfreetype6/changelog.Debian.gz
+    - -usr/share/doc/libfreetype6/pcf/README
+
   glue:
     plugin: dump
     source: snap-wrappers

src/client/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright © 2017 Canonical Ltd.
+# Copyright © 2017-2019 Canonical Ltd.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
@@ -11,31 +11,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Authored by: Alberto Aguirre <[email protected]>
-
-add_library(client STATIC
-  argparser.cpp
-  client.cpp)
-
-target_link_libraries(client
-  cert
-  commands
-  fmt
-  formatter
-  platform
-  rpc
-  Qt5::Core)
-
-add_executable(multipass
-  main.cpp)
-
-target_link_libraries(multipass
-  client)
-
-install(TARGETS multipass
-  DESTINATION bin
-  COMPONENT multipass)
 
-add_subdirectory(cmd)
-add_subdirectory(formatter)
+add_subdirectory(cli)
+add_subdirectory(common)
+add_subdirectory(gui)

src/client/cli/CMakeLists.txt

@@ -0,0 +1,37 @@
+# Copyright © 2017-2019 Canonical Ltd.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+add_library(client STATIC
+  argparser.cpp
+  client.cpp)
+
+target_link_libraries(client
+  commands
+  fmt
+  formatter
+  rpc
+  Qt5::Core)
+
+add_executable(multipass
+  main.cpp)
+
+target_link_libraries(multipass
+  client)
+
+install(TARGETS multipass
+  DESTINATION bin
+  COMPONENT multipass)
+
+add_subdirectory(cmd)
+add_subdirectory(formatter)

src/client/client.cpp → src/client/cli/client.cpp

@@ -13,9 +13,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/>.
  *
- * Authored by: Alberto Aguirre <[email protected]>
- *
  */
+
 #include "client.h"
 #include "cmd/delete.h"
 #include "cmd/exec.h"
@@ -40,42 +39,17 @@
 
 #include <algorithm>
 
-#include <multipass/cert_provider.h>
 #include <multipass/cli/argparser.h>
+#include <multipass/cli/client_common.h>
 #include <multipass/logging/log.h>
 #include <multipass/logging/standard_logger.h>
 
 namespace mp = multipass;
 namespace mpl = multipass::logging;
 
-namespace
-{
-auto make_channel(const std::string& server_address, mp::RpcConnectionType conn_type, mp::CertProvider& cert_provider)
-{
-    std::shared_ptr<grpc::ChannelCredentials> creds;
-    if (conn_type == mp::RpcConnectionType::ssl)
-    {
-        auto opts = grpc::SslCredentialsOptions();
-        opts.server_certificate_request = GRPC_SSL_REQUEST_SERVER_CERTIFICATE_BUT_DONT_VERIFY;
-        opts.pem_cert_chain = cert_provider.PEM_certificate();
-        opts.pem_private_key = cert_provider.PEM_signing_key();
-        creds = grpc::SslCredentials(opts);
-    }
-    else if (conn_type == mp::RpcConnectionType::insecure)
-    {
-        creds = grpc::InsecureChannelCredentials();
-    }
-    else
-    {
-        throw std::runtime_error("Unknown connection type");
-    }
-    return grpc::CreateChannel(server_address, creds);
-}
-} // namespace
-
 mp::Client::Client(ClientConfig& config)
     : cert_provider{std::move(config.cert_provider)},
-      rpc_channel{make_channel(config.server_address, config.conn_type, *cert_provider)},
+      rpc_channel{mp::client::make_channel(config.server_address, config.conn_type, *cert_provider)},
       stub{mp::Rpc::NewStub(rpc_channel)},
       term{config.term}
 {

src/client/client.h → src/client/cli/client.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2017 Canonical, Ltd.
+ * Copyright (C) 2017-2019 Canonical, Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,6 @@
 
 #include <multipass/cert_provider.h>
 #include <multipass/terminal.h>
-#include <multipass/cli/cli.h>
 #include <multipass/cli/command.h>
 #include <multipass/rpc/multipass.grpc.pb.h>
 #include <multipass/rpc_connection_type.h>

src/client/cmd/CMakeLists.txt → src/client/cli/cmd/CMakeLists.txt

@@ -11,8 +11,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-# Authored by: Alberto Aguirre <[email protected]>
 
 add_library(commands STATIC
   animated_spinner.cpp
@@ -39,6 +37,7 @@ add_library(commands STATIC
   ${PLATFORM_COMMANDS})
 
 target_link_libraries(commands
+  client_common
   client_platform
   scp_client
   ssh_client