Add option when installing to enable connman dhcp

Author: zero88

cli/python/src/client/cmd_client.py

@@ -265,7 +265,7 @@ def get_vpn_status(self, vpn_acc: str) -> dict:
             logger.debug(f'Something wrong when getting VPN status. Error[{err}]')
             return {'connected': False}
 
-    def do_install(self, service_opts: UnixServiceOpts, auto_startup: bool = False):
+    def do_install(self, service_opts: UnixServiceOpts, auto_startup: bool = False, auto_connman_dhcp: bool = False):
         FileHelper.mkdirs(self.opts.vpn_dir.parent)
         FileHelper.unpack_archive(ClientOpts.get_resource(ClientOpts.VPN_ZIP), self.opts.vpn_dir)
         FileHelper.mkdirs([self.opts.vpn_dir, self.opts.runtime_dir])
@@ -282,7 +282,7 @@ def do_install(self, service_opts: UnixServiceOpts, auto_startup: bool = False):
         self._dump_cache_service(svc_opts)
         self.device.ip_resolver.add_hook(svc_opts.service_name,
                                          {'{{WORKING_DIR}}': f'{self.opts.vpn_dir}', '{{VPN_CLIENT_CLI}}': cmd})
-        self.device.dns_resolver.create_config(svc_opts.service_name)
+        self.device.dns_resolver.create_config(svc_opts.service_name, auto_connman_dhcp)
         self.storage.empty()
         self.opts.export_env()
 
@@ -383,7 +383,7 @@ def lease_vpn_ip(self, account: str, log_lvl=logger.DEBUG):
         loop_interval(lambda: self.get_vpn_status(account)['connected'],
                       'Unable connect VPN. Please check log for more detail', max_retries=3, interval=1)
         nic = self.opts.account_to_nic(account)
-        if self.device.dns_resolver.is_connman():
+        if not self.device.dns_resolver.is_enable_connman_dhcp():
             logger.log(logger.WARN, f'Please lease VPN IP manually by ' +
                        f'[{self.device.ip_resolver.lease_ip(account, nic, daemon=True, is_execute=False)}]')
             return
@@ -477,6 +477,8 @@ def __download(downloader_opts: DownloaderOpt):
 @click.option("--auto-dnsmasq", type=bool, default=False, flag_value=True, help="Give a try to install dnsmasq")
 @click.option("--dnsmasq/--no-dnsmasq", type=bool, default=True, flag_value=False,
               help="By default, dnsmasq is used as local DNS cache. Disabled it if using default System DNS resolver")
+@click.option("--auto-connman-dhcp", type=bool, flag_value=True,
+              help="Auto start DHCP Client after connecting VPN when using connman")
 @vpn_client_opts
 @dev_mode_opts(opt_name=ClientOpts.OPT_NAME)
 @unix_service_opts(ClientOpts.vpn_service_name())
@@ -485,7 +487,7 @@ def __download(downloader_opts: DownloaderOpt):
 @verbose_opts
 @permission
 def install(vpn_opts: ClientOpts, svc_opts: UnixServiceOpts, auto_startup: bool, auto_dnsmasq: bool, dnsmasq: bool,
-            force: bool):
+            auto_connman_dhcp: bool, force: bool):
     executor = VPNClientExecutor(vpn_opts).probe(log_lvl=logger.INFO)
     dns_resolver = executor.device.dns_resolver
     if not dnsmasq and not dns_resolver.is_connman():
@@ -501,7 +503,7 @@ def install(vpn_opts: ClientOpts, svc_opts: UnixServiceOpts, auto_startup: bool,
     if dnsmasq and not dns_resolver.is_dnsmasq_available() and not dns_resolver.is_connman():
         executor.device.install_dnsmasq(auto_dnsmasq)
     logger.info(f'Installing VPN client into [{vpn_opts.vpn_dir}] and register service[{svc_opts.service_name}]...')
-    executor.do_install(svc_opts, auto_startup)
+    executor.do_install(svc_opts, auto_startup, auto_connman_dhcp)
     logger.done()
 
 
@@ -544,7 +546,8 @@ def _reconnect_vpn(_executor: VPNClientExecutor, _default_acc: str, _current_acc
     default_acc, current_acc, svc_opts, backup_dir = executor.backup_config()
     executor.do_uninstall(keep_vpn=False, keep_dnsmasq=True, service_opts=svc_opts)
     logger.info(f'Re-install VPN client into [{vpn_opts.vpn_dir}]...')
-    executor.do_install(service_opts=svc_opts, auto_startup=False)
+    executor.do_install(service_opts=svc_opts, auto_startup=False,
+                        auto_connman_dhcp=executor.device.dns_resolver.is_enable_connman_dhcp())
     executor.restore_config(backup_dir, keep_backup)
     _reconnect_vpn(executor, default_acc, current_acc)
     logger.done()

cli/python/src/client/device_resolver.py

@@ -518,6 +518,7 @@ class DNSResolver(AppConvention):
     DNS_ORIGIN_FILE = 'resolv.origin.conf'
     VPN_DNS_RESOLV_CFG = 'resolv.vpn.conf'
     VPN_NAMESERVER_HOOK_CFG = 'vpn-runtime-nameserver.conf'
+    CONNMAN_DHCP = 'connman-dhcp'
 
     def __init__(self, resource_dir: Union[str, Path], runtime_dir: Union[str, Path], unix_service: UnixService,
                  log_lvl: int = logger.DEBUG, silent: bool = True):
@@ -526,6 +527,7 @@ def __init__(self, resource_dir: Union[str, Path], runtime_dir: Union[str, Path]
         self.origin_resolv_cfg = DNSResolver.DNS_SYSTEM_FILE.parent.joinpath(DNSResolver.DNS_ORIGIN_FILE)
         self.vpn_resolv_cfg = DNSResolver.DNS_SYSTEM_FILE.parent.joinpath(DNSResolver.VPN_DNS_RESOLV_CFG)
         self.vpn_hook_cfg = self.runtime_dir.joinpath(self.VPN_NAMESERVER_HOOK_CFG)
+        self.connman_dhcp = self.runtime_dir.joinpath(self.CONNMAN_DHCP)
 
     def probe(self) -> 'DNSResolver':
         self.kind = next(
@@ -544,11 +546,15 @@ def probe(self) -> 'DNSResolver':
     def is_connman(self) -> bool:
         return self.kind is DNSResolverType.CONNMAN
 
+    def is_enable_connman_dhcp(self) -> bool:
+        return self.is_connman() and FileHelper.read_file_by_line(self.connman_dhcp, '0').lower() in ('true', 't', '1')
+
     def is_dnsmasq_available(self):
         return self.kind.is_dnsmasq() or self._is_dnsmasq
 
-    def create_config(self, vpn_service: str):
+    def create_config(self, vpn_service: str, auto_connman_dhcp: bool):
         if self.is_connman():
+            FileHelper.write_file(self.connman_dhcp, str(auto_connman_dhcp))
             return
         if not FileHelper.is_readable(self.origin_resolv_cfg):
             logger.info(f'Backup System DNS config file to [{self.origin_resolv_cfg}]...')