erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-09-14 11:37:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #5583 from keymanapp/fix/linux/5575-badzipfile

Browse source 
fix(linux): Check for valid kmp file
This commit is contained in:
Eberhard Beilharz 2021-08-17 11:42:43 +02:00 • committed by GitHub
commit ce132dbc8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 48 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
linux/keyman-config/keyman_config/handle_install.py
View file

@ -5,6 +5,7 @@ from urllib.parse import parse_qs, urlparse
from keyman_config import KeymanComUrl, __tier__
from keyman_config.install_window import InstallKmpWindow
from keyman_config.get_kmp import get_download_folder, download_kmp_file
from zipfile import is_zipfile
def download_and_install_package(url):
@ -42,6 +43,10 @@ def download_and_install_package(url):
logging.critical("Invalid URL: " + url)
return
if not is_zipfile(packageFile):
logging.critical("Not a valid KMP package: " + url)
return
if packageFile and not _install_package(packageFile, bcp47):
logging.log(severity, "Can't find file " + url)

3
linux/keyman-config/km-package-install
View file

@ -9,6 +9,7 @@ from keyman_config.uninstall_kmp import uninstall_kmp
import datetime
import time
from zipfile import is_zipfile
def get_languages():
@ -120,7 +121,7 @@ def main():
if args.file:
name, ext = os.path.splitext(args.file)
if ext != ".kmp":
if ext != ".kmp" or not is_zipfile(args.file):
logging.error("km-package-install: Input file %s is not a kmp file.", args.file)
logging.error("km-package-install -f <kmpfile>")
sys.exit(2)

4
linux/keyman-config/tests/test_gnome_keyboards_util.py
View file

@ -71,14 +71,14 @@ class GnomeKeyboardsUtilTests(unittest.TestCase):
self.MockSettingsClass.return_value.set_value.assert_called_once_with(
"sources", keyboards)
@patch('keyman_config.install_kmp.os.system')
@patch('keyman_config.os.system')
def test_IsGnomeShell_RunningGnomeShell(self, mockSystem):
# Setup
mockSystem.return_value = 0
# Execute/Verify
self.assertEqual(is_gnome_shell(), True)
@patch('keyman_config.install_kmp.os.system')
@patch('keyman_config.os.system')
def test_IsGnomeShell_NotRunningGnomeShell(self, mockSystem):
# Setup
mockSystem.return_value = 1

47
linux/keyman-config/tests/test_handle_install.py
View file

@ -8,53 +8,79 @@ from keyman_config.handle_install import download_and_install_package
class HandleInstallTests(unittest.TestCase):
@patch('keyman_config.handle_install.is_zipfile')
@patch('keyman_config.handle_install._install_package')
def test_downloadAndInstallPackage_file(self, installPackageMethod):
def test_downloadAndInstallPackage_file(self, installPackageMethod, mockIsZipfile):
# Setup
mockIsZipfile.return_value = True
# Execute
download_and_install_package('/tmp/keyboard/sil_euro_latin.kmp')
# Verify
installPackageMethod.assert_called_with('/tmp/keyboard/sil_euro_latin.kmp', '')
@patch('keyman_config.handle_install.is_zipfile')
@patch('keyman_config.handle_install._install_package')
def test_downloadAndInstallPackage_fileUrl(self, installPackageMethod):
def test_downloadAndInstallPackage_fileUrl(self, installPackageMethod, mockIsZipfile):
# Setup
mockIsZipfile.return_value = True
# Execute
download_and_install_package('file:///tmp/keyboard/sil_euro_latin.kmp')
# Verify
installPackageMethod.assert_called_with('/tmp/keyboard/sil_euro_latin.kmp', '')
@patch('keyman_config.handle_install.is_zipfile')
@patch('keyman_config.handle_install._install_package')
def test_downloadAndInstallPackage_fileUrlWithBcp47(self, installPackageMethod):
def test_downloadAndInstallPackage_fileUrlWithBcp47(self, installPackageMethod,
mockIsZipfile):
# Setup
mockIsZipfile.return_value = True
# Execute
download_and_install_package('file:///tmp/keyboard/sil_euro_latin.kmp?bcp47=dyo')
# Verify
installPackageMethod.assert_called_with('/tmp/keyboard/sil_euro_latin.kmp', 'dyo')
@patch('keyman_config.handle_install.is_zipfile')
@patch('keyman_config.handle_install._install_package')
def test_downloadAndInstallPackage_fileUrlWithBcp47AndVersion(self, installPackageMethod):
def test_downloadAndInstallPackage_fileUrlWithBcp47AndVersion(self, installPackageMethod,
mockIsZipfile):
# Setup
mockIsZipfile.return_value = True
# Execute
download_and_install_package('file:///tmp/keyboard/sil_euro_latin.kmp?bcp47=dyo&version=1')
# Verify
installPackageMethod.assert_called_with('/tmp/keyboard/sil_euro_latin.kmp', 'dyo')
@patch('keyman_config.handle_install.is_zipfile')
@patch('keyman_config.handle_install._install_package')
def test_downloadAndInstallPackage_InvalidUrl(self, installPackageMethod):
def test_downloadAndInstallPackage_InvalidUrl(self, installPackageMethod, mockIsZipfile):
# Setup
mockIsZipfile.return_value = True
# Execute
download_and_install_package('http://localhost/keyboard/sil_euro_latin.kmp')
# Verify
installPackageMethod.assert_not_called()
@patch('keyman_config.handle_install.is_zipfile')
@patch('keyman_config.handle_install._install_package')
@patch('keyman_config.get_kmp.download_kmp_file')
def test_downloadAndInstallPackage_invalidUrl(self, downloadKmpFileMethod,
installPackageMethod):
installPackageMethod, mockIsZipfile):
for url in ['foo://download/keyboard/sil_euro_latin', 'keyman://keyboard/sil_euro_latin',
'keyman://download/sil_euro_latin', 'keyman://download/keyboard/']:
with self.subTest(url=url):
# Setup
mockIsZipfile.return_value = True
# Execute
download_and_install_package(url)
@ -62,15 +88,18 @@ class HandleInstallTests(unittest.TestCase):
downloadKmpFileMethod.assert_not_called()
installPackageMethod.assert_not_called()
@patch('keyman_config.handle_install.is_zipfile')
@patch('keyman_config.handle_install._install_package')
@patch('keyman_config.get_kmp.keyman_cache_dir')
@patch('keyman_config.handle_install.download_kmp_file')
def test_downloadAndInstallPackage_keymanUrl(self, downloadKmpFileMethod,
keymanCacheDirMethod, installPackageMethod):
keymanCacheDirMethod, installPackageMethod,
mockIsZipfile):
# Setup
mockPackagePath = '/tmp/sil_euro_latin'
keymanCacheDirMethod.return_value = '/tmp'
downloadKmpFileMethod.return_value = mockPackagePath
mockIsZipfile.return_value = True
# Execute
download_and_install_package('keyman://download/keyboard/sil_euro_latin')
@ -81,16 +110,18 @@ class HandleInstallTests(unittest.TestCase):
mockPackagePath)
installPackageMethod.assert_called_with(mockPackagePath, '')
@patch('keyman_config.handle_install.is_zipfile')
@patch('keyman_config.handle_install._install_package')
@patch('keyman_config.get_kmp.keyman_cache_dir')
@patch('keyman_config.handle_install.download_kmp_file')
def test_downloadAndInstallPackage_keymanUrlWithBcp47(self, downloadKmpFileMethod,
keymanCacheDirMethod,
installPackageMethod):
installPackageMethod, mockIsZipfile):
# Setup
mockPackagePath = '/tmp/sil_euro_latin'
keymanCacheDirMethod.return_value = '/tmp'
downloadKmpFileMethod.return_value = mockPackagePath
mockIsZipfile.return_value = True
# Execute
download_and_install_package('keyman://download/keyboard/sil_euro_latin?bcp47=de')