From 4746c8c72606546ab4f17bb6ba397805d9998fbd Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Tue, 1 Sep 2020 10:24:48 +0200 Subject: [PATCH 001/261] server: move UpdateDefaultNic to vm work job queue (#4020) While remove secondary nic from a Running vm, if update the default nic to the secondary nic before the nic is removed, the vm will not have default nic (and cannot be started) when both operations are completed. It is because UpdateDefaultNic api is not handled as a vm work job (AddNicToVMCmd and RemoveNicFromVMCmd are), it is processed before nic is removed. The result is that secondary nic becomes default nic and got removed. --- .../com/cloud/vm/VirtualMachineManager.java | 2 + .../cloud/vm/VirtualMachineManagerImpl.java | 112 ++++++++++++++++++ .../com/cloud/vm/VmWorkUpdateDefaultNic.java | 39 ++++++ .../java/com/cloud/vm/UserVmManagerImpl.java | 12 +- 4 files changed, 156 insertions(+), 9 deletions(-) create mode 100644 engine/orchestration/src/main/java/com/cloud/vm/VmWorkUpdateDefaultNic.java diff --git a/engine/api/src/main/java/com/cloud/vm/VirtualMachineManager.java b/engine/api/src/main/java/com/cloud/vm/VirtualMachineManager.java index 50d78f43033e..dc54f543c324 100644 --- a/engine/api/src/main/java/com/cloud/vm/VirtualMachineManager.java +++ b/engine/api/src/main/java/com/cloud/vm/VirtualMachineManager.java @@ -187,6 +187,8 @@ NicProfile addVmToNetwork(VirtualMachine vm, Network network, NicProfile request */ boolean removeNicFromVm(VirtualMachine vm, Nic nic) throws ConcurrentOperationException, ResourceUnavailableException; + Boolean updateDefaultNicForVM(VirtualMachine vm, Nic nic, Nic defaultNic); + /** * @param vm * @param network diff --git a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java index 8f722c92fdea..7ffd023383c7 100755 --- a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java @@ -5741,4 +5741,116 @@ private Pair orchestrateRestoreVirtualMachine(final VmWo return new Pair(JobInfo.Status.SUCCEEDED, _jobMgr.marshallResultObject(passwordMap)); } + @Override + public Boolean updateDefaultNicForVM(final VirtualMachine vm, final Nic nic, final Nic defaultNic) { + + final AsyncJobExecutionContext jobContext = AsyncJobExecutionContext.getCurrentExecutionContext(); + if (jobContext.isJobDispatchedBy(VmWorkConstants.VM_WORK_JOB_DISPATCHER)) { + VmWorkJobVO placeHolder = null; + placeHolder = createPlaceHolderWork(vm.getId()); + try { + return orchestrateUpdateDefaultNicForVM(vm, nic, defaultNic); + } finally { + if (placeHolder != null) { + _workJobDao.expunge(placeHolder.getId()); + } + } + } else { + final Outcome outcome = updateDefaultNicForVMThroughJobQueue(vm, nic, defaultNic); + + try { + outcome.get(); + } catch (final InterruptedException e) { + throw new RuntimeException("Operation is interrupted", e); + } catch (final java.util.concurrent.ExecutionException e) { + throw new RuntimeException("Execution exception", e); + } + + final Object jobResult = _jobMgr.unmarshallResultObject(outcome.getJob()); + if (jobResult != null) { + if (jobResult instanceof Boolean) { + return (Boolean)jobResult; + } + } + + throw new RuntimeException("Unexpected job execution result"); + } + } + + private Boolean orchestrateUpdateDefaultNicForVM(final VirtualMachine vm, final Nic nic, final Nic defaultNic) { + + s_logger.debug("Updating default nic of vm " + vm + " from nic " + defaultNic.getUuid() + " to nic " + nic.getUuid()); + Integer chosenID = nic.getDeviceId(); + Integer existingID = defaultNic.getDeviceId(); + NicVO nicVO = _nicsDao.findById(nic.getId()); + NicVO defaultNicVO = _nicsDao.findById(defaultNic.getId()); + + nicVO.setDefaultNic(true); + nicVO.setDeviceId(existingID); + defaultNicVO.setDefaultNic(false); + defaultNicVO.setDeviceId(chosenID); + + _nicsDao.persist(nicVO); + _nicsDao.persist(defaultNicVO); + return true; + } + + public Outcome updateDefaultNicForVMThroughJobQueue(final VirtualMachine vm, final Nic nic, final Nic defaultNic) { + + final CallContext context = CallContext.current(); + final User user = context.getCallingUser(); + final Account account = context.getCallingAccount(); + + final List pendingWorkJobs = _workJobDao.listPendingWorkJobs( + VirtualMachine.Type.Instance, vm.getId(), + VmWorkUpdateDefaultNic.class.getName()); + + VmWorkJobVO workJob = null; + if (pendingWorkJobs != null && pendingWorkJobs.size() > 0) { + assert pendingWorkJobs.size() == 1; + workJob = pendingWorkJobs.get(0); + } else { + + workJob = new VmWorkJobVO(context.getContextId()); + + workJob.setDispatcher(VmWorkConstants.VM_WORK_JOB_DISPATCHER); + workJob.setCmd(VmWorkUpdateDefaultNic.class.getName()); + + workJob.setAccountId(account.getId()); + workJob.setUserId(user.getId()); + workJob.setVmType(VirtualMachine.Type.Instance); + workJob.setVmInstanceId(vm.getId()); + workJob.setRelated(AsyncJobExecutionContext.getOriginJobId()); + + final VmWorkUpdateDefaultNic workInfo = new VmWorkUpdateDefaultNic(user.getId(), account.getId(), vm.getId(), + VirtualMachineManagerImpl.VM_WORK_JOB_HANDLER, nic.getId(), defaultNic.getId()); + workJob.setCmdInfo(VmWorkSerializer.serialize(workInfo)); + + _jobMgr.submitAsyncJob(workJob, VmWorkConstants.VM_WORK_QUEUE, vm.getId()); + } + AsyncJobExecutionContext.getCurrentExecutionContext().joinJob(workJob.getId()); + + return new VmJobVirtualMachineOutcome(workJob, vm.getId()); + } + + @ReflectionUse + private Pair orchestrateUpdateDefaultNic(final VmWorkUpdateDefaultNic work) throws Exception { + final VMInstanceVO vm = _entityMgr.findById(VMInstanceVO.class, work.getVmId()); + if (vm == null) { + s_logger.info("Unable to find vm " + work.getVmId()); + } + assert vm != null; + final NicVO nic = _entityMgr.findById(NicVO.class, work.getNicId()); + if (nic == null) { + throw new CloudRuntimeException("Unable to find nic " + work.getNicId()); + } + final NicVO defaultNic = _entityMgr.findById(NicVO.class, work.getDefaultNicId()); + if (defaultNic == null) { + throw new CloudRuntimeException("Unable to find default nic " + work.getDefaultNicId()); + } + final boolean result = orchestrateUpdateDefaultNicForVM(vm, nic, defaultNic); + return new Pair(JobInfo.Status.SUCCEEDED, + _jobMgr.marshallResultObject(result)); + } + } diff --git a/engine/orchestration/src/main/java/com/cloud/vm/VmWorkUpdateDefaultNic.java b/engine/orchestration/src/main/java/com/cloud/vm/VmWorkUpdateDefaultNic.java new file mode 100644 index 000000000000..14f323994493 --- /dev/null +++ b/engine/orchestration/src/main/java/com/cloud/vm/VmWorkUpdateDefaultNic.java @@ -0,0 +1,39 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.vm; + +public class VmWorkUpdateDefaultNic extends VmWork { + private static final long serialVersionUID = -4265657031064437934L; + + Long nicId; + Long defaultNicId; + + public VmWorkUpdateDefaultNic(long userId, long accountId, long vmId, String handlerName, Long nicId, Long defaultNicId) { + super(userId, accountId, vmId, handlerName); + + this.nicId = nicId; + this.defaultNicId = defaultNicId; + } + + public Long getNicId() { + return nicId; + } + + public Long getDefaultNicId() { + return defaultNicId; + } +} diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java index 56eab1a065f9..802ac1e0dd7c 100644 --- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java @@ -1477,16 +1477,10 @@ public UserVm updateDefaultNicForVirtualMachine(UpdateDefaultNicForVMCmd cmd) th Integer chosenID = nic.getDeviceId(); Integer existingID = existing.getDeviceId(); - nic.setDefaultNic(true); - nic.setDeviceId(existingID); - existingVO.setDefaultNic(false); - existingVO.setDeviceId(chosenID); - - nic = _nicDao.persist(nic); - existingVO = _nicDao.persist(existingVO); - Network newdefault = null; - newdefault = _networkModel.getDefaultNetworkForVm(vmId); + if (_itMgr.updateDefaultNicForVM(vmInstance, nic, existingVO)) { + newdefault = _networkModel.getDefaultNetworkForVm(vmId); + } if (newdefault == null) { nic.setDefaultNic(false); From d5acabdbf7c2b49db3bc35f8434724b9a979843b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Beims=20Br=C3=A4scher?= Date: Tue, 1 Sep 2020 05:28:42 -0300 Subject: [PATCH 002/261] server: Avoid Null pointer at DomainChecker and enhance AssignVMCmd (#4279) When executing request assignVirtualMachine with null domainID and a valid projectID then a NullPointerException happens at DomainChecker.java. Command example: assign virtualmachine virtualmachineid=vmID projectid=projectID account=admin The NullPointerException that is thrown at DomainChecker is handled at AssignVMCmd.java#L142, resulting in the following log message: Failed to move vm null. --- .../cloudstack/api/command/admin/vm/AssignVMCmd.java | 10 ++++++++-- server/src/main/java/com/cloud/acl/DomainChecker.java | 5 +++++ .../src/main/java/com/cloud/vm/UserVmManagerImpl.java | 4 ++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java index da5f68860bc6..7b577963f1b5 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java @@ -138,8 +138,14 @@ public void execute() { e.printStackTrace(); throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage()); } catch (Exception e) { - e.printStackTrace(); - throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to move vm " + e.getMessage()); + s_logger.error("Failed to move vm due to: " + e.getStackTrace()); + if (e.getMessage() != null) { + throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to move vm due to " + e.getMessage()); + } else if (e.getCause() != null) { + throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to move vm due to " + e.getCause()); + } else { + throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to move vm"); + } } } diff --git a/server/src/main/java/com/cloud/acl/DomainChecker.java b/server/src/main/java/com/cloud/acl/DomainChecker.java index 1077d2bc4803..5fc2b343be9e 100644 --- a/server/src/main/java/com/cloud/acl/DomainChecker.java +++ b/server/src/main/java/com/cloud/acl/DomainChecker.java @@ -106,6 +106,11 @@ public boolean checkAccess(Account caller, Domain domain) throws PermissionDenie if (caller.getState() != Account.State.enabled) { throw new PermissionDeniedException(caller + " is disabled."); } + + if (domain == null) { + throw new PermissionDeniedException(String.format("Provided domain is NULL, cannot check access for account [uuid=%s, name=%s]", caller.getUuid(), caller.getAccountName())); + } + long domainId = domain.getId(); if (_accountService.isNormalUser(caller.getId())) { diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java index 802ac1e0dd7c..f99a0663e298 100644 --- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java @@ -6133,6 +6133,10 @@ public UserVm moveVMToUser(final AssignVMCmd cmd) throws ResourceAllocationExcep throw new InvalidParameterValueException("The new account owner " + cmd.getAccountName() + " is disabled."); } + if (cmd.getProjectId() != null && cmd.getDomainId() == null) { + throw new InvalidParameterValueException("Please provide a valid domain ID; cannot assign VM to a project if domain ID is NULL."); + } + //check caller has access to both the old and new account _accountMgr.checkAccess(caller, null, true, oldAccount); _accountMgr.checkAccess(caller, null, true, newAccount); From cb717741fc26662551458f9aa5ceb459884b7a6f Mon Sep 17 00:00:00 2001 From: Spaceman1984 <49917670+Spaceman1984@users.noreply.github.com> Date: Tue, 1 Sep 2020 12:23:52 +0200 Subject: [PATCH 003/261] server: Fixed delayed power state update after vm shutdown (#4284) After a vm is shutdown, the power state isn't updated immediately. This prevents changing the service offering. This PR updates the power state immediately after the vm is confirmed to be shutdown. Fixes: #3159 --- .../src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java index 7ffd023383c7..b8342b4a60e3 100755 --- a/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java @@ -1658,6 +1658,9 @@ protected boolean sendStop(final VirtualMachineGuru guru, final VirtualMachinePr } guru.finalizeStop(profile, answer); + final UserVmVO userVm = _userVmDao.findById(vm.getId()); + userVm.setPowerState(PowerState.PowerOff); + _userVmDao.update(userVm.getId(), userVm); } else { s_logger.error("Invalid answer received in response to a StopCommand for " + vm.getInstanceName()); return false; From 5c29d5ba453b3441f2fd84232f9d833c288c72ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Beims=20Br=C3=A4scher?= Date: Tue, 1 Sep 2020 07:29:43 -0300 Subject: [PATCH 004/261] influxdb: Avoid out of memory by influxDB (#4291) After a few hours running with InfluxDB configured, CloudStack hangs due to OutOfMemoryException raised. The exception happens at com.cloud.server.StatsCollector.writeBatches(StatsCollector.java:1510): 2020-08-12 21:19:00,972 ERROR [c.c.s.StatsCollector] (StatsCollector-6:ctx-0a4cfe6a) (logid:03a7ba48) Error trying to retrieve host stats java.lang.OutOfMemoryError: unable to create new native thread ... at org.influxdb.impl.BatchProcessor.(BatchProcessor.java:294) at org.influxdb.impl.BatchProcessor$Builder.build(BatchProcessor.java:201) at org.influxdb.impl.InfluxDBImpl.enableBatch(InfluxDBImpl.java:311) at com.cloud.server.StatsCollector.writeBatches(StatsCollector.java:1510) at com.cloud.server.StatsCollector$AbstractStatsCollector.sendMetricsToInfluxdb(StatsCollector.java:1351) at com.cloud.server.StatsCollector$HostCollector.runInContext(StatsCollector.java:522) Context on InfluxDB Batch: Enabling batch on InfluxDB is great and speeds writing but it requires caution to avoid Zombie threads. Solution: This happens because the batching feature creates an internal thread pool that needs to be shut down explicitly; therefore, it is important to add: influxDB.close(). --- pom.xml | 2 +- .../java/com/cloud/server/StatsCollector.java | 30 +++++++++++-------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index c38b840b238a..64a34f7ff2f3 100644 --- a/pom.xml +++ b/pom.xml @@ -130,7 +130,7 @@ 23.6-jre 4.5.4 4.4.8 - 2.15 + 2.20 2.9.2 1.9.2 0.16 diff --git a/server/src/main/java/com/cloud/server/StatsCollector.java b/server/src/main/java/com/cloud/server/StatsCollector.java index 5683106931d7..3937bd99666a 100644 --- a/server/src/main/java/com/cloud/server/StatsCollector.java +++ b/server/src/main/java/com/cloud/server/StatsCollector.java @@ -1334,21 +1334,25 @@ abstract class AbstractStatsCollector extends ManagedContextRunnable { protected void sendMetricsToInfluxdb(Map metrics) { InfluxDB influxDbConnection = createInfluxDbConnection(); - Pong response = influxDbConnection.ping(); - if (response.getVersion().equalsIgnoreCase("unknown")) { - throw new CloudRuntimeException(String.format("Cannot ping influxdb host %s:%s.", externalStatsHost, externalStatsPort)); - } + try { + Pong response = influxDbConnection.ping(); + if (response.getVersion().equalsIgnoreCase("unknown")) { + throw new CloudRuntimeException(String.format("Cannot ping influxdb host %s:%s.", externalStatsHost, externalStatsPort)); + } - Collection metricsObjects = metrics.values(); - List points = new ArrayList<>(); + Collection metricsObjects = metrics.values(); + List points = new ArrayList<>(); - s_logger.debug(String.format("Sending stats to %s host %s:%s", externalStatsType, externalStatsHost, externalStatsPort)); + s_logger.debug(String.format("Sending stats to %s host %s:%s", externalStatsType, externalStatsHost, externalStatsPort)); - for (Object metricsObject : metricsObjects) { - Point vmPoint = creteInfluxDbPoint(metricsObject); - points.add(vmPoint); + for (Object metricsObject : metricsObjects) { + Point vmPoint = creteInfluxDbPoint(metricsObject); + points.add(vmPoint); + } + writeBatches(influxDbConnection, databaseName, points); + } finally { + influxDbConnection.close(); } - writeBatches(influxDbConnection, databaseName, points); } /** @@ -1507,7 +1511,9 @@ protected InfluxDB createInfluxDbConnection() { */ protected void writeBatches(InfluxDB influxDbConnection, String dbName, List points) { BatchPoints batchPoints = BatchPoints.database(dbName).build(); - influxDbConnection.enableBatch(BatchOptions.DEFAULTS); + if(!influxDbConnection.isBatchEnabled()){ + influxDbConnection.enableBatch(BatchOptions.DEFAULTS); + } for (Point point : points) { batchPoints.point(point); From f38db8ae65c42559c2acda31fbb5be6349703b8b Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Fri, 4 Sep 2020 09:27:58 +0200 Subject: [PATCH 005/261] Ubuntu 20.04: restart libvirtd instead of libvirt-bin (#4301) --- python/lib/cloudutils/serviceConfig.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/python/lib/cloudutils/serviceConfig.py b/python/lib/cloudutils/serviceConfig.py index 37fa5a95485d..0d8d5916a154 100755 --- a/python/lib/cloudutils/serviceConfig.py +++ b/python/lib/cloudutils/serviceConfig.py @@ -592,8 +592,11 @@ def config(self): cfo.addEntry("group", "\"root\"") cfo.save() - self.syscfg.svo.stopService("libvirt-bin") - self.syscfg.svo.enableService("libvirt-bin") + if os.path.exists("/lib/systemd/system/libvirtd.service"): + bash("systemctl restart libvirtd") + else: + self.syscfg.svo.stopService("libvirt-bin") + self.syscfg.svo.enableService("libvirt-bin") if os.path.exists("/lib/systemd/system/libvirt-bin.socket"): bash("systemctl stop libvirt-bin.socket") return True From 6c4cdebfd8cda7b0af96affbdd3333037a6097a0 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Wed, 9 Sep 2020 12:26:16 +0200 Subject: [PATCH 006/261] Ubuntu 20.04: Fix issue while build package on ubuntu 20.04 (#4306) error: dpkg-checkbuilddeps: error: Unmet build dependencies: python-mysql.connector root cause: python-mysql.connector is not valid any more in ubuntu 20.04 root@buildbox-ubuntu20:~# dpkg -l |grep connector ii python3-mysql.connector 8.0.15-2build1 all pure Python implementation of MySQL Client/Server protocol (Python3) solution: use python3-mysql.connector instead --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index c917e53766a5..64f092a26173 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: libs Priority: extra Maintainer: Wido den Hollander Build-Depends: debhelper (>= 9), openjdk-11-jdk | java11-sdk | java11-jdk | zulu-11, genisoimage, - python-mysql.connector, maven (>= 3) | maven3, python (>= 2.7), python3 (>= 3), lsb-release, dh-systemd, python-setuptools + python-mysql.connector | python3-mysql.connector, maven (>= 3) | maven3, python (>= 2.7), python3 (>= 3), lsb-release, dh-systemd, python-setuptools Standards-Version: 3.8.1 Homepage: http://www.cloudstack.org/ From 37c7a2b8512fbb9539c284e087b0d07f4f41b23b Mon Sep 17 00:00:00 2001 From: Pearl Dsilva Date: Wed, 9 Sep 2020 15:57:49 +0530 Subject: [PATCH 007/261] Incorrect md5sums for systemVM templates results in failure to download templates to other image stores (#4297) Co-authored-by: Pearl Dsilva --- .../com/cloud/upgrade/dao/Upgrade41310to41400.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41310to41400.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41310to41400.java index 0ce6809bc64e..583feeaa55e8 100644 --- a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41310to41400.java +++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41310to41400.java @@ -136,12 +136,12 @@ private void updateSystemVmTemplates(final Connection conn) { final Map newTemplateChecksum = new HashMap() { { - put(Hypervisor.HypervisorType.KVM, "d15ed159be32151b07e3211caf9cb802"); - put(Hypervisor.HypervisorType.XenServer, "fcaf1abc9aa62e7ed75f62b3092a01a2"); - put(Hypervisor.HypervisorType.VMware, "eb39f8b5a556dfc93c6be23ae45f34e1"); - put(Hypervisor.HypervisorType.Hyperv, "b4e91c14958e0fca9470695b0be05f99"); - put(Hypervisor.HypervisorType.LXC, "d15ed159be32151b07e3211caf9cb802"); - put(Hypervisor.HypervisorType.Ovm3, "1f97f4beb30af8cda886f1e977514704"); + put(Hypervisor.HypervisorType.KVM, "4978e6e6140d167556f201496549a498"); + put(Hypervisor.HypervisorType.XenServer, "2e3078de2ccce760d537e06fd9b4c7c7"); + put(Hypervisor.HypervisorType.VMware, "33cad72f858aef11c95df486b0f21938"); + put(Hypervisor.HypervisorType.Hyperv, "cf58913fb5cc830749760895dc9f406f"); + put(Hypervisor.HypervisorType.LXC, "4978e6e6140d167556f201496549a498"); + put(Hypervisor.HypervisorType.Ovm3, "3b8df36a9dc8b87ae3892da61d8e2679"); } }; From 43a25c78f65f1f300e61ac57bf2b4f9ad4c74ca7 Mon Sep 17 00:00:00 2001 From: Rakesh Date: Fri, 11 Sep 2020 14:36:20 +0200 Subject: [PATCH 008/261] Display acl name in listNetworks response (#4317) * Display acl name in listNetworks response Display acl name along with its id so that we dont need to make extra api call to get acl name * Add since tag --- .../java/org/apache/cloudstack/api/ApiConstants.java | 1 + .../cloudstack/api/response/NetworkResponse.java | 12 ++++++++++++ .../main/java/com/cloud/api/ApiResponseHelper.java | 1 + 3 files changed, 14 insertions(+) diff --git a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java index 630db737cf8d..df284552f5d4 100644 --- a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java +++ b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java @@ -719,6 +719,7 @@ public class ApiConstants { public static final String AFFINITY_GROUP_ID = "affinitygroupid"; public static final String DEPLOYMENT_PLANNER = "deploymentplanner"; public static final String ACL_ID = "aclid"; + public static final String ACL_NAME = "aclname"; public static final String NUMBER = "number"; public static final String IS_DYNAMICALLY_SCALABLE = "isdynamicallyscalable"; public static final String ROUTING = "isrouting"; diff --git a/api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java index 84a5aaa8b19e..4079ab31e662 100644 --- a/api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java +++ b/api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java @@ -238,6 +238,10 @@ public class NetworkResponse extends BaseResponse implements ControlledEntityRes @Param(description = "If the network has redundant routers enabled", since = "4.11.1") private Boolean redundantRouter; + @SerializedName(ApiConstants.ACL_NAME) + @Param(description = "ACL name associated with the VPC network", since = "4.15.0") + private String aclName; + public Boolean getDisplayNetwork() { return displayNetwork; } @@ -458,4 +462,12 @@ public Boolean getRedundantRouter() { public void setRedundantRouter(Boolean redundantRouter) { this.redundantRouter = redundantRouter; } + + public String getAclName() { + return aclName; + } + + public void setAclName(String aclName) { + this.aclName = aclName; + } } diff --git a/server/src/main/java/com/cloud/api/ApiResponseHelper.java b/server/src/main/java/com/cloud/api/ApiResponseHelper.java index be35c4bdaf2e..201ea1c4eff1 100644 --- a/server/src/main/java/com/cloud/api/ApiResponseHelper.java +++ b/server/src/main/java/com/cloud/api/ApiResponseHelper.java @@ -2279,6 +2279,7 @@ public NetworkResponse createNetworkResponse(ResponseView view, Network network) NetworkACL acl = ApiDBUtils.findByNetworkACLId(network.getNetworkACLId()); if (acl != null) { response.setAclId(acl.getUuid()); + response.setAclName(acl.getName()); } } From f06daa5f8a7c98afb9dfa4e04af3089c7dab894c Mon Sep 17 00:00:00 2001 From: Pearl Dsilva Date: Tue, 15 Sep 2020 13:23:54 +0530 Subject: [PATCH 009/261] Change Global setting type for allow.user.create.projects (#4320) Co-authored-by: Pearl Dsilva --- server/src/main/java/com/cloud/configuration/Config.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/com/cloud/configuration/Config.java b/server/src/main/java/com/cloud/configuration/Config.java index 3daf720138c1..17418d809f67 100644 --- a/server/src/main/java/com/cloud/configuration/Config.java +++ b/server/src/main/java/com/cloud/configuration/Config.java @@ -1525,7 +1525,7 @@ public enum Config { AllowUserToCreateProject( "Project Defaults", ManagementServer.class, - Long.class, + Boolean.class, "allow.user.create.projects", "true", "If regular user can create a project; true by default", From caefb0c9b5f3b7234291f13d272c15a928489b3f Mon Sep 17 00:00:00 2001 From: Pearl Dsilva Date: Tue, 15 Sep 2020 13:25:19 +0530 Subject: [PATCH 010/261] test: Increase wait time before running the ssvm health check script on SSVM reboot (#4312) Co-authored-by: Pearl Dsilva --- test/integration/smoke/test_ssvm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/smoke/test_ssvm.py b/test/integration/smoke/test_ssvm.py index 75e7538b0477..bb83931c1fd9 100644 --- a/test/integration/smoke/test_ssvm.py +++ b/test/integration/smoke/test_ssvm.py @@ -875,7 +875,7 @@ def test_07_reboot_ssvm(self): self.waitForSystemVMAgent(ssvm_response.name) # Wait until NFS stores mounted before running the script - time.sleep(30) + time.sleep(90) # Call to verify cloud process is running self.test_03_ssvm_internals() From b464fe41c67812145731c7c6c3edebb94bc47487 Mon Sep 17 00:00:00 2001 From: Pearl Dsilva Date: Thu, 17 Sep 2020 10:12:10 +0530 Subject: [PATCH 011/261] server: Secondary Storage Usage Improvements (#4053) This feature enables the following: Balanced migration of data objects from source Image store to destination Image store(s) Complete migration of data setting an image store to read-only viewing download progress of templates across all data stores Related Primate PR: apache/cloudstack-primate#326 --- .../main/java/com/cloud/event/EventTypes.java | 6 + .../com/cloud/storage/StorageService.java | 2 + .../main/java/com/cloud/storage/Volume.java | 2 + .../apache/cloudstack/api/ApiConstants.java | 5 + .../org/apache/cloudstack/api/BaseCmd.java | 3 + .../admin/storage/ListImageStoresCmd.java | 10 +- .../MigrateSecondaryStorageDataCmd.java | 115 +++++ .../admin/storage/UpdateImageStoreCmd.java | 89 ++++ .../api/response/ImageStoreResponse.java | 16 +- .../api/response/MigrationResponse.java | 73 +++ .../api/response/TemplateResponse.java | 9 + .../cloudstack/storage/ImageStoreService.java | 29 ++ .../service/StorageOrchestrationService.java | 27 ++ .../api/storage/DataStoreManager.java | 6 + .../api/storage/EndPointSelector.java | 2 + .../ObjectInDataStoreStateMachine.java | 7 +- .../api/storage/SecondaryStorageService.java | 43 ++ .../subsystem/api/storage/SnapshotInfo.java | 4 + .../com/cloud/storage/StorageManager.java | 6 + .../orchestration/DataMigrationUtility.java | 258 ++++++++++ .../orchestration/StorageOrchestrator.java | 451 ++++++++++++++++++ ...ring-engine-orchestration-core-context.xml | 5 + .../main/java/com/cloud/host/dao/HostDao.java | 4 + .../java/com/cloud/host/dao/HostDaoImpl.java | 22 + .../cloud/secstorage/CommandExecLogDao.java | 1 + .../secstorage/CommandExecLogDaoImpl.java | 16 +- .../storage/datastore/db/ImageStoreDao.java | 2 +- .../datastore/db/ImageStoreDaoImpl.java | 5 +- .../storage/datastore/db/ImageStoreVO.java | 11 + .../datastore/db/SnapshotDataStoreDao.java | 5 + .../datastore/db/TemplateDataStoreDao.java | 2 + .../META-INF/db/schema-41310to41400.sql | 27 ++ .../storage/motion/DataMotionServiceImpl.java | 11 +- .../image/SecondaryStorageServiceImpl.java | 203 ++++++++ .../image/TemplateDataFactoryImpl.java | 11 +- .../storage/image/TemplateServiceImpl.java | 2 +- .../ImageStoreProviderManagerImpl.java | 66 ++- .../storage/image/store/TemplateObject.java | 4 +- ...ring-engine-storage-image-core-context.xml | 6 +- .../storage/snapshot/SnapshotObject.java | 23 +- .../datastore/DataStoreManagerImpl.java | 26 +- .../ObjectInDataStoreManagerImpl.java | 8 + .../endpoint/DefaultEndPointSelector.java | 23 +- .../image/BaseImageStoreDriverImpl.java | 139 +++++- .../datastore/ImageStoreProviderManager.java | 4 + .../image/db/SnapshotDataStoreDaoImpl.java | 28 +- .../image/db/TemplateDataStoreDaoImpl.java | 10 + .../storage/volume/VolumeObject.java | 9 +- .../framework/jobs/dao/AsyncJobDaoImpl.java | 4 +- .../metrics/PrometheusExporterImpl.java | 2 +- pom.xml | 1 + server/pom.xml | 5 + .../com/cloud/api/query/QueryManagerImpl.java | 11 +- .../api/query/dao/ImageStoreJoinDaoImpl.java | 1 + .../api/query/dao/TemplateJoinDaoImpl.java | 27 +- .../cloud/api/query/vo/ImageStoreJoinVO.java | 7 + .../ConfigurationManagerImpl.java | 2 +- .../cloud/server/ManagementServerImpl.java | 4 + .../cloud/storage/ImageStoreServiceImpl.java | 163 +++++++ .../com/cloud/storage/StorageManagerImpl.java | 18 +- .../cloud/storage/VolumeApiServiceImpl.java | 34 +- .../storage/download/DownloadListener.java | 2 +- .../secondary/SecondaryStorageVmManager.java | 4 + .../template/HypervisorTemplateAdapter.java | 44 +- .../cloud/template/TemplateManagerImpl.java | 2 +- .../diagnostics/DiagnosticsServiceImpl.java | 2 +- .../spring-server-core-managers-context.xml | 2 + .../ConfigurationManagerTest.java | 16 +- .../PremiumSecondaryStorageManagerImpl.java | 87 +++- .../SecondaryStorageManagerImpl.java | 11 +- .../resource/NfsSecondaryStorageResource.java | 100 +++- .../smoke/test_secondary_storage.py | 173 +++++++ test/integration/smoke/test_templates.py | 34 ++ tools/apidoc/gen_toc.py | 1 + 74 files changed, 2467 insertions(+), 126 deletions(-) create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/storage/MigrateSecondaryStorageDataCmd.java create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateImageStoreCmd.java create mode 100644 api/src/main/java/org/apache/cloudstack/api/response/MigrationResponse.java create mode 100644 api/src/main/java/org/apache/cloudstack/storage/ImageStoreService.java create mode 100644 engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/StorageOrchestrationService.java create mode 100644 engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/SecondaryStorageService.java create mode 100644 engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/DataMigrationUtility.java create mode 100644 engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/StorageOrchestrator.java create mode 100644 engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/SecondaryStorageServiceImpl.java create mode 100644 server/src/main/java/com/cloud/storage/ImageStoreServiceImpl.java diff --git a/api/src/main/java/com/cloud/event/EventTypes.java b/api/src/main/java/com/cloud/event/EventTypes.java index d14719247c17..d723f563ad82 100644 --- a/api/src/main/java/com/cloud/event/EventTypes.java +++ b/api/src/main/java/com/cloud/event/EventTypes.java @@ -70,6 +70,7 @@ import com.cloud.server.ResourceTag; import com.cloud.storage.GuestOS; import com.cloud.storage.GuestOSHypervisor; +import com.cloud.storage.ImageStore; import com.cloud.storage.Snapshot; import com.cloud.storage.StoragePool; import com.cloud.storage.Volume; @@ -239,6 +240,7 @@ public class EventTypes { public static final String EVENT_TEMPLATE_EXTRACT = "TEMPLATE.EXTRACT"; public static final String EVENT_TEMPLATE_UPLOAD = "TEMPLATE.UPLOAD"; public static final String EVENT_TEMPLATE_CLEANUP = "TEMPLATE.CLEANUP"; + public static final String EVENT_FILE_MIGRATE = "FILE.MIGRATE"; // Volume Events public static final String EVENT_VOLUME_CREATE = "VOLUME.CREATE"; @@ -329,6 +331,8 @@ public class EventTypes { public static final String EVENT_STORAGE_IP_RANGE_DELETE = "STORAGE.IP.RANGE.DELETE"; public static final String EVENT_STORAGE_IP_RANGE_UPDATE = "STORAGE.IP.RANGE.UPDATE"; + public static final String EVENT_IMAGE_STORE_DATA_MIGRATE = "IMAGE.STORE.MIGRATE.DATA"; + // Configuration Table public static final String EVENT_CONFIGURATION_VALUE_EDIT = "CONFIGURATION.VALUE.EDIT"; @@ -1021,6 +1025,8 @@ public class EventTypes { entityEventDetails.put(EVENT_POD_ROLLING_MAINTENANCE, PodResponse.class); entityEventDetails.put(EVENT_CLUSTER_ROLLING_MAINTENANCE, ClusterResponse.class); entityEventDetails.put(EVENT_HOST_ROLLING_MAINTENANCE, HostResponse.class); + + entityEventDetails.put(EVENT_IMAGE_STORE_DATA_MIGRATE, ImageStore.class); } public static String getEntityForEvent(String eventName) { diff --git a/api/src/main/java/com/cloud/storage/StorageService.java b/api/src/main/java/com/cloud/storage/StorageService.java index aebbbcd4bd04..207fc8f0cd7a 100644 --- a/api/src/main/java/com/cloud/storage/StorageService.java +++ b/api/src/main/java/com/cloud/storage/StorageService.java @@ -102,4 +102,6 @@ public interface StorageService { */ ImageStore migrateToObjectStore(String name, String url, String providerName, Map details) throws DiscoveryException; + ImageStore updateImageStoreStatus(Long id, Boolean readonly); + } diff --git a/api/src/main/java/com/cloud/storage/Volume.java b/api/src/main/java/com/cloud/storage/Volume.java index dde9d60a8482..5fd78efb307e 100644 --- a/api/src/main/java/com/cloud/storage/Volume.java +++ b/api/src/main/java/com/cloud/storage/Volume.java @@ -84,6 +84,8 @@ public String getDescription() { s_fsm.addTransition(new StateMachine2.Transition(Resizing, Event.OperationFailed, Ready, null)); s_fsm.addTransition(new StateMachine2.Transition(Allocated, Event.UploadRequested, UploadOp, null)); s_fsm.addTransition(new StateMachine2.Transition(Uploaded, Event.CopyRequested, Copying, null)); + s_fsm.addTransition(new StateMachine2.Transition(Ready, Event.OperationSucceeded, Ready, null)); + s_fsm.addTransition(new StateMachine2.Transition(Ready, Event.OperationFailed, Ready, null)); s_fsm.addTransition(new StateMachine2.Transition(Copying, Event.OperationSucceeded, Ready, Arrays.asList(new StateMachine2.Transition.Impact[]{StateMachine2.Transition.Impact.USAGE}))); s_fsm.addTransition(new StateMachine2.Transition(Copying, Event.OperationFailed, Uploaded, null)); s_fsm.addTransition(new StateMachine2.Transition(UploadOp, Event.DestroyRequested, Destroy, null)); diff --git a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java index df284552f5d4..88f083b50e6c 100644 --- a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java +++ b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java @@ -114,6 +114,7 @@ public class ApiConstants { public static final String DISK_IO_WRITE = "diskiowrite"; public static final String DISK_IO_PSTOTAL = "diskiopstotal"; public static final String DISK_SIZE = "disksize"; + public static final String DOWNLOAD_DETAILS = "downloaddetails"; public static final String UTILIZATION = "utilization"; public static final String DRIVER = "driver"; public static final String ROOT_DISK_SIZE = "rootdisksize"; @@ -235,6 +236,7 @@ public class ApiConstants { public static final String MAX_MEMORY = "maxmemory"; public static final String MIN_CPU_NUMBER = "mincpunumber"; public static final String MIN_MEMORY = "minmemory"; + public static final String MIGRATION_TYPE = "migrationtype"; public static final String MEMORY = "memory"; public static final String MODE = "mode"; public static final String KEEPALIVE_ENABLED = "keepaliveenabled"; @@ -355,6 +357,7 @@ public class ApiConstants { public static final String TARGET_IQN = "targetiqn"; public static final String TEMPLATE_FILTER = "templatefilter"; public static final String TEMPLATE_ID = "templateid"; + public static final String TEMPLATE_IDS = "templateids"; public static final String TEMPLATE_NAME = "templatename"; public static final String ISO_ID = "isoid"; public static final String TIMEOUT = "timeout"; @@ -789,6 +792,8 @@ public class ApiConstants { public static final String EXITCODE = "exitcode"; public static final String TARGET_ID = "targetid"; public static final String FILES = "files"; + public static final String SRC_POOL = "srcpool"; + public static final String DEST_POOLS = "destpools"; public static final String VOLUME_IDS = "volumeids"; public static final String ROUTER_ID = "routerid"; diff --git a/api/src/main/java/org/apache/cloudstack/api/BaseCmd.java b/api/src/main/java/org/apache/cloudstack/api/BaseCmd.java index 5b4c7aa3ef8b..c897aad4d4b4 100644 --- a/api/src/main/java/org/apache/cloudstack/api/BaseCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/BaseCmd.java @@ -40,6 +40,7 @@ import org.apache.cloudstack.network.lb.ApplicationLoadBalancerService; import org.apache.cloudstack.network.lb.InternalLoadBalancerVMService; import org.apache.cloudstack.query.QueryService; +import org.apache.cloudstack.storage.ImageStoreService; import org.apache.cloudstack.usage.UsageService; import org.apache.log4j.Logger; @@ -131,6 +132,8 @@ public static enum CommandType { @Inject public TemplateApiService _templateService; @Inject + public ImageStoreService _imageStoreService; + @Inject public SecurityGroupService _securityGroupService; @Inject public SnapshotApiService _snapshotService; diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListImageStoresCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListImageStoresCmd.java index 8c37c78c7632..4f7cf81f20db 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListImageStoresCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListImageStoresCmd.java @@ -16,8 +16,6 @@ // under the License. package org.apache.cloudstack.api.command.admin.storage; -import org.apache.log4j.Logger; - import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListCmd; @@ -25,6 +23,7 @@ import org.apache.cloudstack.api.response.ImageStoreResponse; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.ZoneResponse; +import org.apache.log4j.Logger; @APICommand(name = "listImageStores", description = "Lists image stores.", responseObject = ImageStoreResponse.class, since = "4.2.0", requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) @@ -52,6 +51,9 @@ public class ListImageStoresCmd extends BaseListCmd { @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = ImageStoreResponse.class, description = "the ID of the storage pool") private Long id; + @Parameter(name = ApiConstants.READ_ONLY, type = CommandType.BOOLEAN, entityType = ImageStoreResponse.class, description = "read-only status of the image store", since = "4.15.0") + private Boolean readonly; + ///////////////////////////////////////////////////// /////////////////// Accessors /////////////////////// ///////////////////////////////////////////////////// @@ -80,6 +82,10 @@ public void setProvider(String provider) { this.provider = provider; } + public Boolean getReadonly() { + return readonly; + } + ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/MigrateSecondaryStorageDataCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/MigrateSecondaryStorageDataCmd.java new file mode 100644 index 000000000000..9abbecfcd8e7 --- /dev/null +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/MigrateSecondaryStorageDataCmd.java @@ -0,0 +1,115 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package org.apache.cloudstack.api.command.admin.storage; + +import java.util.List; + +import org.apache.cloudstack.acl.RoleType; +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.BaseAsyncCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.response.ImageStoreResponse; +import org.apache.cloudstack.api.response.MigrationResponse; +import org.apache.cloudstack.context.CallContext; +import org.apache.log4j.Logger; + +import com.cloud.event.EventTypes; + +@APICommand(name = MigrateSecondaryStorageDataCmd.APINAME, + description = "migrates data objects from one secondary storage to destination image store(s)", + responseObject = MigrationResponse.class, + requestHasSensitiveInfo = false, + responseHasSensitiveInfo = false, + since = "4.15.0", + authorized = {RoleType.Admin}) +public class MigrateSecondaryStorageDataCmd extends BaseAsyncCmd { + + public static final Logger LOGGER = Logger.getLogger(MigrateSecondaryStorageDataCmd.class.getName()); + + public static final String APINAME = "migrateSecondaryStorageData"; + + ///////////////////////////////////////////////////// + //////////////// API parameters ///////////////////// + ///////////////////////////////////////////////////// + + @Parameter(name = ApiConstants.SRC_POOL, + type = CommandType.UUID, + entityType = ImageStoreResponse.class, + description = "id of the image store from where the data is to be migrated", + required = true) + private Long id; + + @Parameter(name = ApiConstants.DEST_POOLS, + type = CommandType.LIST, + collectionType = CommandType.UUID, + entityType = ImageStoreResponse.class, + description = "id(s) of the destination secondary storage pool(s) to which the templates are to be migrated", + required = true) + private List migrateTo; + + @Parameter(name = ApiConstants.MIGRATION_TYPE, + type = CommandType.STRING, + description = "Balance: if you want data to be distributed evenly among the destination stores, " + + "Complete: If you want to migrate the entire data from source image store to the destination store(s). Default: Complete") + private String migrationType; + + ///////////////////////////////////////////////////// + /////////////////// Accessors /////////////////////// + ///////////////////////////////////////////////////// + + public Long getId() { + return id; + } + + public List getMigrateTo() { + return migrateTo; + } + + public String getMigrationType() { + return migrationType; + } + + @Override + public String getEventType() { + return EventTypes.EVENT_IMAGE_STORE_DATA_MIGRATE; + } + + @Override + public String getEventDescription() { + return "Attempting to migrate files/data objects "; + } + + @Override + public void execute() { + MigrationResponse response = _imageStoreService.migrateData(this); + response.setObjectName("imagestore"); + this.setResponseObject(response); + CallContext.current().setEventDetails(response.getMessage()); + } + + @Override + public String getCommandName() { + return APINAME.toLowerCase() + BaseAsyncCmd.RESPONSE_SUFFIX; + } + + @Override + public long getEntityOwnerId() { + return CallContext.current().getCallingAccountId(); + } +} \ No newline at end of file diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateImageStoreCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateImageStoreCmd.java new file mode 100644 index 000000000000..d7dca93b485a --- /dev/null +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateImageStoreCmd.java @@ -0,0 +1,89 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package org.apache.cloudstack.api.command.admin.storage; + +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.response.ImageStoreResponse; +import org.apache.cloudstack.context.CallContext; +import org.apache.log4j.Logger; + +import com.cloud.storage.ImageStore; + +@APICommand(name = UpdateImageStoreCmd.APINAME, description = "Updates image store read-only status", responseObject = ImageStoreResponse.class, entityType = {ImageStore.class}, + requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.15.0") +public class UpdateImageStoreCmd extends BaseCmd { + private static final Logger LOG = Logger.getLogger(UpdateImageStoreCmd.class.getName()); + public static final String APINAME = "updateImageStore"; + + ///////////////////////////////////////////////////// + //////////////// API parameters ///////////////////// + ///////////////////////////////////////////////////// + @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = ImageStoreResponse.class, required = true, description = "Image Store UUID") + private Long id; + + @Parameter(name = ApiConstants.READ_ONLY, type = CommandType.BOOLEAN, required = true, description = "If set to true, it designates the corresponding image store to read-only, " + + "hence not considering them during storage migration") + private Boolean readonly; + + ///////////////////////////////////////////////////// + /////////////////// Accessors /////////////////////// + ///////////////////////////////////////////////////// + + public Long getId() { + return id; + } + + public Boolean getReadonly() { + return readonly; + } + + ///////////////////////////////////////////////////// + /////////////// API Implementation/////////////////// + ///////////////////////////////////////////////////// + + @Override + public void execute() { + ImageStore result = _storageService.updateImageStoreStatus(getId(), getReadonly()); + ImageStoreResponse storeResponse = null; + if (result != null) { + storeResponse = _responseGenerator.createImageStoreResponse(result); + storeResponse.setResponseName(getCommandName()+"response"); + storeResponse.setObjectName("imagestore"); + setResponseObject(storeResponse); + } else { + throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to update Image store status"); + } + + } + + @Override + public String getCommandName() { + return APINAME; + } + + + @Override + public long getEntityOwnerId() { + return CallContext.current().getCallingAccountId(); + } +} diff --git a/api/src/main/java/org/apache/cloudstack/api/response/ImageStoreResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/ImageStoreResponse.java index fba9b2d946a7..190181e67a99 100644 --- a/api/src/main/java/org/apache/cloudstack/api/response/ImageStoreResponse.java +++ b/api/src/main/java/org/apache/cloudstack/api/response/ImageStoreResponse.java @@ -16,8 +16,6 @@ // under the License. package org.apache.cloudstack.api.response; -import com.google.gson.annotations.SerializedName; - import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; @@ -25,6 +23,7 @@ import com.cloud.serializer.Param; import com.cloud.storage.ImageStore; import com.cloud.storage.ScopeType; +import com.google.gson.annotations.SerializedName; @EntityReference(value = ImageStore.class) public class ImageStoreResponse extends BaseResponse { @@ -60,6 +59,10 @@ public class ImageStoreResponse extends BaseResponse { @Param(description = "the scope of the image store") private ScopeType scope; + @SerializedName("readonly") + @Param(description = "defines if store is read-only") + private Boolean readonly; + @SerializedName("disksizetotal") @Param(description = "the total disk size of the host") private Long diskSizeTotal; @@ -140,6 +143,12 @@ public void setProtocol(String protocol) { this.protocol = protocol; } + public Boolean getReadonly() { + return readonly; + } + + public void setReadonly(Boolean readonly) { this.readonly = readonly; } + public void setDiskSizeTotal(Long diskSizeTotal) { this.diskSizeTotal = diskSizeTotal; } @@ -147,5 +156,4 @@ public void setDiskSizeTotal(Long diskSizeTotal) { public void setDiskSizeUsed(Long diskSizeUsed) { this.diskSizeUsed = diskSizeUsed; } - -} +} \ No newline at end of file diff --git a/api/src/main/java/org/apache/cloudstack/api/response/MigrationResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/MigrationResponse.java new file mode 100644 index 000000000000..c67b1d2d13ee --- /dev/null +++ b/api/src/main/java/org/apache/cloudstack/api/response/MigrationResponse.java @@ -0,0 +1,73 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package org.apache.cloudstack.api.response; + +import org.apache.cloudstack.api.BaseResponse; +import org.apache.cloudstack.api.EntityReference; + +import com.cloud.serializer.Param; +import com.cloud.storage.ImageStore; +import com.google.gson.annotations.SerializedName; + +@EntityReference(value = ImageStore.class) +public class MigrationResponse extends BaseResponse { + @SerializedName("message") + @Param(description = "Response message from migration of secondary storage data objects") + private String message; + + @SerializedName("migrationtype") + @Param(description = "Type of migration requested for") + private String migrationType; + + @SerializedName("success") + @Param(description = "true if operation is executed successfully") + private boolean success; + + MigrationResponse() { + } + + public MigrationResponse(String message, String migrationType, boolean success) { + this.message = message; + this.migrationType = migrationType; + this.success = success; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public String getMigrationType() { + return migrationType; + } + + public void setMigrationType(String migrationType) { + this.migrationType = migrationType; + } + + public boolean isSuccess() { + return success; + } + + public void setSuccess(boolean success) { + this.success = success; + } +} diff --git a/api/src/main/java/org/apache/cloudstack/api/response/TemplateResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/TemplateResponse.java index 81fc2f37b0d6..094fe2aa5660 100644 --- a/api/src/main/java/org/apache/cloudstack/api/response/TemplateResponse.java +++ b/api/src/main/java/org/apache/cloudstack/api/response/TemplateResponse.java @@ -18,6 +18,7 @@ import java.util.Date; import java.util.LinkedHashSet; +import java.util.List; import java.util.Map; import java.util.Set; @@ -173,6 +174,10 @@ public class TemplateResponse extends BaseResponseWithTagInformation implements @Param(description = "additional key/value details tied with template") private Map details; + @SerializedName(ApiConstants.DOWNLOAD_DETAILS) + @Param(description = "Lists the download progress of a template across all secondary storages") + private List> downloadDetails; + @SerializedName(ApiConstants.BITS) @Param(description = "the processor bit size", since = "4.10") private int bits; @@ -255,6 +260,10 @@ public void setPublic(boolean isPublic) { this.isPublic = isPublic; } + public void setDownloadProgress(List> downloadDetails) { + this.downloadDetails = downloadDetails; + } + public void setCreated(Date created) { this.created = created; } diff --git a/api/src/main/java/org/apache/cloudstack/storage/ImageStoreService.java b/api/src/main/java/org/apache/cloudstack/storage/ImageStoreService.java new file mode 100644 index 000000000000..b8f14ad2bfaf --- /dev/null +++ b/api/src/main/java/org/apache/cloudstack/storage/ImageStoreService.java @@ -0,0 +1,29 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package org.apache.cloudstack.storage; + +import org.apache.cloudstack.api.command.admin.storage.MigrateSecondaryStorageDataCmd; +import org.apache.cloudstack.api.response.MigrationResponse; + +public interface ImageStoreService { + + public static enum MigrationPolicy { + BALANCE, COMPLETE + } + MigrationResponse migrateData(MigrateSecondaryStorageDataCmd cmd); +} diff --git a/engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/StorageOrchestrationService.java b/engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/StorageOrchestrationService.java new file mode 100644 index 000000000000..7bf845d3ec56 --- /dev/null +++ b/engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/StorageOrchestrationService.java @@ -0,0 +1,27 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package org.apache.cloudstack.engine.orchestration.service; + +import java.util.List; + +import org.apache.cloudstack.api.response.MigrationResponse; +import org.apache.cloudstack.storage.ImageStoreService.MigrationPolicy; + +public interface StorageOrchestrationService { + MigrationResponse migrateData(Long srcDataStoreId, List destDatastores, MigrationPolicy migrationPolicy); +} diff --git a/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreManager.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreManager.java index ad5b1622cd22..80e3ce11c759 100644 --- a/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreManager.java +++ b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreManager.java @@ -33,10 +33,16 @@ public interface DataStoreManager { List getImageStoresByScope(ZoneScope scope); + List getImageStoresByScopeExcludingReadOnly(ZoneScope scope); + DataStore getRandomImageStore(long zoneId); + DataStore getRandomUsableImageStore(long zoneId); + DataStore getImageStoreWithFreeCapacity(long zoneId); + DataStore getImageStoreWithFreeCapacity(List imageStores); + List listImageStoresWithFreeCapacity(long zoneId); List getImageCacheStores(Scope scope); diff --git a/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/EndPointSelector.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/EndPointSelector.java index 0613a11572f7..ec2725019983 100644 --- a/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/EndPointSelector.java +++ b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/EndPointSelector.java @@ -33,6 +33,8 @@ public interface EndPointSelector { List selectAll(DataStore store); + List findAllEndpointsForScope(DataStore store); + EndPoint select(Scope scope, Long storeId); EndPoint select(DataStore store, String downloadUrl); diff --git a/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/ObjectInDataStoreStateMachine.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/ObjectInDataStoreStateMachine.java index 204cab0bd74c..611d1247c49d 100644 --- a/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/ObjectInDataStoreStateMachine.java +++ b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/ObjectInDataStoreStateMachine.java @@ -29,6 +29,7 @@ enum State { Ready("Template downloading is accomplished"), Copying("The object is being coping"), Migrating("The object is being migrated"), + Migrated("The object has been migrated"), Destroying("Template is destroying"), Destroyed("Template is destroyed"), Failed("Failed to download template"); @@ -49,12 +50,16 @@ enum Event { DestroyRequested, OperationSuccessed, OperationFailed, + CopyRequested, CopyingRequested, MigrationRequested, + MigrationSucceeded, + MigrationFailed, MigrationCopyRequested, MigrationCopySucceeded, MigrationCopyFailed, ResizeRequested, - ExpungeRequested + ExpungeRequested, + MigrateDataRequested } } diff --git a/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/SecondaryStorageService.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/SecondaryStorageService.java new file mode 100644 index 000000000000..07828fda5ce7 --- /dev/null +++ b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/SecondaryStorageService.java @@ -0,0 +1,43 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package org.apache.cloudstack.engine.subsystem.api.storage; + +import java.util.List; +import java.util.Map; + +import org.apache.cloudstack.framework.async.AsyncCallFuture; +import org.apache.cloudstack.storage.command.CommandResult; + +import com.cloud.utils.Pair; + +public interface SecondaryStorageService { + class DataObjectResult extends CommandResult { + private final DataObject data; + + public DataObjectResult(DataObject data) { + super(); + this.data = data; + } + + public DataObject getData() { + return this.data; + } + + } + AsyncCallFuture migrateData(DataObject srcDataObject, DataStore srcDatastore, DataStore destDatastore, Map, Long>> snapshotChain); +} diff --git a/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotInfo.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotInfo.java index ef72afc5b777..58a82ac2c740 100644 --- a/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotInfo.java +++ b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/SnapshotInfo.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.engine.subsystem.api.storage; +import java.util.List; + import com.cloud.storage.Snapshot; import com.cloud.utils.exception.CloudRuntimeException; @@ -26,6 +28,8 @@ public interface SnapshotInfo extends DataObject, Snapshot { SnapshotInfo getChild(); + List getChildren(); + VolumeInfo getBaseVolume(); void addPayload(Object data); diff --git a/engine/components-api/src/main/java/com/cloud/storage/StorageManager.java b/engine/components-api/src/main/java/com/cloud/storage/StorageManager.java index 62a241be4345..0f52206dd785 100644 --- a/engine/components-api/src/main/java/com/cloud/storage/StorageManager.java +++ b/engine/components-api/src/main/java/com/cloud/storage/StorageManager.java @@ -112,6 +112,12 @@ public interface StorageManager extends StorageService { ConfigKey PRIMARY_STORAGE_DOWNLOAD_WAIT = new ConfigKey("Storage", Integer.class, "primary.storage.download.wait", "10800", "In second, timeout for download template to primary storage", false); + ConfigKey SecStorageMaxMigrateSessions = new ConfigKey("Advanced", Integer.class, "secstorage.max.migrate.sessions", "2", + "The max number of concurrent copy command execution sessions that an SSVM can handle", true, ConfigKey.Scope.Global); + + ConfigKey MaxDataMigrationWaitTime = new ConfigKey("Advanced", Integer.class, "max.data.migration.wait.time", "15", + "Maximum wait time for a data migration task before spawning a new SSVM", false, ConfigKey.Scope.Global); + /** * Returns a comma separated list of tags for the specified storage pool * @param poolId diff --git a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/DataMigrationUtility.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/DataMigrationUtility.java new file mode 100644 index 000000000000..86b7350d138b --- /dev/null +++ b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/DataMigrationUtility.java @@ -0,0 +1,258 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package org.apache.cloudstack.engine.orchestration; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + +import javax.inject.Inject; + +import org.apache.cloudstack.engine.subsystem.api.storage.DataObject; +import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; +import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine; +import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotDataFactory; +import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotInfo; +import org.apache.cloudstack.engine.subsystem.api.storage.TemplateDataFactory; +import org.apache.cloudstack.engine.subsystem.api.storage.VolumeDataFactory; +import org.apache.cloudstack.storage.ImageStoreService; +import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreDao; +import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreVO; +import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao; +import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO; +import org.apache.cloudstack.storage.datastore.db.VolumeDataStoreDao; +import org.apache.cloudstack.storage.datastore.db.VolumeDataStoreVO; + +import com.cloud.host.HostVO; +import com.cloud.host.Status; +import com.cloud.host.dao.HostDao; +import com.cloud.storage.DataStoreRole; +import com.cloud.storage.SnapshotVO; +import com.cloud.storage.VMTemplateVO; +import com.cloud.storage.dao.SnapshotDao; +import com.cloud.storage.dao.VMTemplateDao; +import com.cloud.utils.Pair; +import com.cloud.utils.exception.CloudRuntimeException; +import com.cloud.vm.SecondaryStorageVmVO; +import com.cloud.vm.VirtualMachine; +import com.cloud.vm.dao.SecondaryStorageVmDao; + +public class DataMigrationUtility { + @Inject + SecondaryStorageVmDao secStorageVmDao; + @Inject + TemplateDataStoreDao templateDataStoreDao; + @Inject + SnapshotDataStoreDao snapshotDataStoreDao; + @Inject + VolumeDataStoreDao volumeDataStoreDao; + @Inject + VMTemplateDao templateDao; + @Inject + VolumeDataFactory volumeFactory; + @Inject + TemplateDataFactory templateFactory; + @Inject + SnapshotDataFactory snapshotFactory; + @Inject + HostDao hostDao; + @Inject + SnapshotDao snapshotDao; + + /** + * This function verifies if the given image store contains data objects that are not in any of the following states: + * "Ready" "Allocated", "Destroying", "Destroyed", "Failed". If this is the case, and if the migration policy is complete, + * the migration is terminated. + */ + private boolean filesReadyToMigrate(Long srcDataStoreId) { + String[] validStates = new String[]{"Ready", "Allocated", "Destroying", "Destroyed", "Failed"}; + boolean isReady = true; + List templates = templateDataStoreDao.listByStoreId(srcDataStoreId); + for (TemplateDataStoreVO template : templates) { + isReady &= (Arrays.asList(validStates).contains(template.getState().toString())); + } + List snapshots = snapshotDataStoreDao.listByStoreId(srcDataStoreId, DataStoreRole.Image); + for (SnapshotDataStoreVO snapshot : snapshots) { + isReady &= (Arrays.asList(validStates).contains(snapshot.getState().toString())); + } + List volumes = volumeDataStoreDao.listByStoreId(srcDataStoreId); + for (VolumeDataStoreVO volume : volumes) { + isReady &= (Arrays.asList(validStates).contains(volume.getState().toString())); + } + return isReady; + } + + protected void checkIfCompleteMigrationPossible(ImageStoreService.MigrationPolicy policy, Long srcDataStoreId) { + if (policy == ImageStoreService.MigrationPolicy.COMPLETE) { + if (!filesReadyToMigrate(srcDataStoreId)) { + throw new CloudRuntimeException("Complete migration failed as there are data objects which are not Ready - i.e, they may be in Migrating, creating, copying, etc. states"); + } + } + return; + } + + protected Long getFileSize(DataObject file, Map, Long>> snapshotChain) { + Long size = file.getSize(); + Pair, Long> chain = snapshotChain.get(file); + if (file instanceof SnapshotInfo && chain.first() != null) { + size = chain.second(); + } + return size; + } + + /** + * Sorts the datastores in decreasing order of their free capacities, so as to make + * an informed decision of picking the datastore with maximum free capactiy for migration + */ + protected List sortDataStores(Map> storageCapacities) { + List>> list = + new LinkedList>>((storageCapacities.entrySet())); + + Collections.sort(list, new Comparator>>() { + @Override + public int compare(Map.Entry> e1, Map.Entry> e2) { + return e2.getValue().first() > e1.getValue().first() ? 1 : -1; + } + }); + HashMap> temp = new LinkedHashMap<>(); + for (Map.Entry> value : list) { + temp.put(value.getKey(), value.getValue()); + } + + return new ArrayList<>(temp.keySet()); + } + + protected List getSortedValidSourcesList(DataStore srcDataStore, Map, Long>> snapshotChains) { + List files = new ArrayList<>(); + files.addAll(getAllReadyTemplates(srcDataStore)); + files.addAll(getAllReadySnapshotsAndChains(srcDataStore, snapshotChains)); + files.addAll(getAllReadyVolumes(srcDataStore)); + + files = sortFilesOnSize(files, snapshotChains); + + return files; + } + + protected List sortFilesOnSize(List files, Map, Long>> snapshotChains) { + Collections.sort(files, new Comparator() { + @Override + public int compare(DataObject o1, DataObject o2) { + Long size1 = o1.getSize(); + Long size2 = o2.getSize(); + if (o1 instanceof SnapshotInfo) { + size1 = snapshotChains.get(o1).second(); + } + if (o2 instanceof SnapshotInfo) { + size2 = snapshotChains.get(o2).second(); + } + return size2 > size1 ? 1 : -1; + } + }); + return files; + } + + protected List getAllReadyTemplates(DataStore srcDataStore) { + + List files = new LinkedList<>(); + List templates = templateDataStoreDao.listByStoreId(srcDataStore.getId()); + for (TemplateDataStoreVO template : templates) { + VMTemplateVO templateVO = templateDao.findById(template.getTemplateId()); + if (template.getState() == ObjectInDataStoreStateMachine.State.Ready && !templateVO.isPublicTemplate()) { + files.add(templateFactory.getTemplate(template.getTemplateId(), srcDataStore)); + } + } + return files; + } + + /** Returns parent snapshots and snapshots that do not have any children; snapshotChains comprises of the snapshot chain info + * for each parent snapshot and the cumulative size of the chain - this is done to ensure that all the snapshots in a chain + * are migrated to the same datastore + */ + protected List getAllReadySnapshotsAndChains(DataStore srcDataStore, Map, Long>> snapshotChains) { + List files = new LinkedList<>(); + List snapshots = snapshotDataStoreDao.listByStoreId(srcDataStore.getId(), DataStoreRole.Image); + for (SnapshotDataStoreVO snapshot : snapshots) { + SnapshotVO snapshotVO = snapshotDao.findById(snapshot.getSnapshotId()); + if (snapshot.getState() == ObjectInDataStoreStateMachine.State.Ready && snapshot.getParentSnapshotId() == 0 ) { + SnapshotInfo snap = snapshotFactory.getSnapshot(snapshotVO.getSnapshotId(), DataStoreRole.Image); + files.add(snap); + } + } + + for (SnapshotInfo parent : files) { + List chain = new ArrayList<>(); + chain.add(parent); + for (int i =0; i< chain.size(); i++) { + SnapshotInfo child = chain.get(i); + List children = child.getChildren(); + if (children != null) { + chain.addAll(children); + } + } + snapshotChains.put(parent, new Pair, Long>(chain, getSizeForChain(chain))); + } + + return (List) (List) files; + } + + protected Long getSizeForChain(List chain) { + Long size = 0L; + for (SnapshotInfo snapshot : chain) { + size += snapshot.getSize(); + } + return size; + } + + + protected List getAllReadyVolumes(DataStore srcDataStore) { + List files = new LinkedList<>(); + List volumes = volumeDataStoreDao.listByStoreId(srcDataStore.getId()); + for (VolumeDataStoreVO volume : volumes) { + if (volume.getState() == ObjectInDataStoreStateMachine.State.Ready) { + files.add(volumeFactory.getVolume(volume.getVolumeId(), srcDataStore)); + } + } + return files; + } + + /** Returns the count of active SSVMs - SSVM with agents in connected state, so as to dynamically increase the thread pool + * size when SSVMs scale + */ + protected int activeSSVMCount(DataStore dataStore) { + long datacenterId = dataStore.getScope().getScopeId(); + List ssvms = + secStorageVmDao.getSecStorageVmListInStates(null, datacenterId, VirtualMachine.State.Running, VirtualMachine.State.Migrating); + int activeSSVMs = 0; + for (SecondaryStorageVmVO vm : ssvms) { + String name = "s-"+vm.getId()+"-VM"; + HostVO ssHost = hostDao.findByName(name); + if (ssHost != null) { + if (ssHost.getState() == Status.Up) { + activeSSVMs++; + } + } + } + return activeSSVMs; + } +} diff --git a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/StorageOrchestrator.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/StorageOrchestrator.java new file mode 100644 index 000000000000..85b182a3dc21 --- /dev/null +++ b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/StorageOrchestrator.java @@ -0,0 +1,451 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package org.apache.cloudstack.engine.orchestration; + +import java.util.ArrayList; +import java.util.Date; +import java.util.HashMap; +import java.util.Hashtable; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.ArrayBlockingQueue; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; + +import javax.inject.Inject; +import javax.naming.ConfigurationException; + +import org.apache.cloudstack.api.response.MigrationResponse; +import org.apache.cloudstack.engine.orchestration.service.StorageOrchestrationService; +import org.apache.cloudstack.engine.subsystem.api.storage.DataObject; +import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; +import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; +import org.apache.cloudstack.engine.subsystem.api.storage.SecondaryStorageService; +import org.apache.cloudstack.engine.subsystem.api.storage.SecondaryStorageService.DataObjectResult; +import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotDataFactory; +import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotInfo; +import org.apache.cloudstack.framework.async.AsyncCallFuture; +import org.apache.cloudstack.framework.config.ConfigKey; +import org.apache.cloudstack.framework.config.Configurable; +import org.apache.cloudstack.framework.config.dao.ConfigurationDao; +import org.apache.cloudstack.storage.ImageStoreService.MigrationPolicy; +import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreDao; +import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreVO; +import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao; +import org.apache.cloudstack.storage.datastore.db.VolumeDataStoreDao; +import org.apache.commons.math3.stat.descriptive.moment.Mean; +import org.apache.commons.math3.stat.descriptive.moment.StandardDeviation; +import org.apache.log4j.Logger; + +import com.cloud.server.StatsCollector; +import com.cloud.storage.DataStoreRole; +import com.cloud.storage.SnapshotVO; +import com.cloud.storage.StorageManager; +import com.cloud.storage.StorageService; +import com.cloud.storage.StorageStats; +import com.cloud.storage.dao.SnapshotDao; +import com.cloud.utils.Pair; +import com.cloud.utils.component.ManagerBase; +import com.cloud.utils.exception.CloudRuntimeException; + +public class StorageOrchestrator extends ManagerBase implements StorageOrchestrationService, Configurable { + + private static final Logger s_logger = Logger.getLogger(StorageOrchestrator.class); + @Inject + SnapshotDataStoreDao snapshotDataStoreDao; + @Inject + SnapshotDao snapshotDao; + @Inject + SnapshotDataFactory snapshotFactory; + @Inject + DataStoreManager dataStoreManager; + @Inject + StatsCollector statsCollector; + @Inject + public StorageService storageService; + @Inject + ConfigurationDao configDao; + @Inject + private SecondaryStorageService secStgSrv; + @Inject + TemplateDataStoreDao templateDataStoreDao; + @Inject + VolumeDataStoreDao volumeDataStoreDao; + @Inject + DataMigrationUtility migrationHelper; + + ConfigKey ImageStoreImbalanceThreshold = new ConfigKey<>("Advanced", Double.class, + "image.store.imbalance.threshold", + "0.3", + "The storage imbalance threshold that is compared with the standard deviation percentage for a storage utilization metric. " + + "The value is a percentage in decimal format.", + true, ConfigKey.Scope.Global); + + Integer numConcurrentCopyTasksPerSSVM = 2; + private double imageStoreCapacityThreshold = 0.90; + + @Override + public String getConfigComponentName() { + return StorageOrchestrationService.class.getName(); + } + + @Override + public ConfigKey[] getConfigKeys() { + return new ConfigKey[]{ImageStoreImbalanceThreshold}; + } + + static class MigrateBlockingQueue extends ArrayBlockingQueue { + + MigrateBlockingQueue(int size) { + super(size); + } + + public boolean offer(T task) { + try { + this.put(task); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + return true; + } + } + + @Override + public boolean configure(String name, Map params) throws ConfigurationException { + numConcurrentCopyTasksPerSSVM = StorageManager.SecStorageMaxMigrateSessions.value(); + return true; + } + + @Override + public MigrationResponse migrateData(Long srcDataStoreId, List destDatastores, MigrationPolicy migrationPolicy) { + List files = new LinkedList<>(); + boolean success = true; + String message = null; + + migrationHelper.checkIfCompleteMigrationPossible(migrationPolicy, srcDataStoreId); + DataStore srcDatastore = dataStoreManager.getDataStore(srcDataStoreId, DataStoreRole.Image); + Map, Long>> snapshotChains = new HashMap<>(); + files = migrationHelper.getSortedValidSourcesList(srcDatastore, snapshotChains); + + if (files.isEmpty()) { + return new MigrationResponse("No files in Image store "+srcDatastore.getId()+ " to migrate", migrationPolicy.toString(), true); + } + Map> storageCapacities = new Hashtable<>(); + for (Long storeId : destDatastores) { + storageCapacities.put(storeId, new Pair<>(null, null)); + } + storageCapacities.put(srcDataStoreId, new Pair<>(null, null)); + if (migrationPolicy == MigrationPolicy.COMPLETE) { + s_logger.debug("Setting source image store "+srcDatastore.getId()+ " to read-only"); + storageService.updateImageStoreStatus(srcDataStoreId, true); + } + + storageCapacities = getStorageCapacities(storageCapacities, srcDataStoreId); + double meanstddev = getStandardDeviation(storageCapacities); + double threshold = ImageStoreImbalanceThreshold.value(); + MigrationResponse response = null; + ThreadPoolExecutor executor = new ThreadPoolExecutor(numConcurrentCopyTasksPerSSVM , numConcurrentCopyTasksPerSSVM, 30, + TimeUnit.MINUTES, new MigrateBlockingQueue<>(numConcurrentCopyTasksPerSSVM)); + Date start = new Date(); + if (meanstddev < threshold && migrationPolicy == MigrationPolicy.BALANCE) { + s_logger.debug("mean std deviation of the image stores is below threshold, no migration required"); + response = new MigrationResponse("Migration not required as system seems balanced", migrationPolicy.toString(), true); + return response; + } + + List>> futures = new ArrayList<>(); + while (true) { + DataObject chosenFileForMigration = null; + if (files.size() > 0) { + chosenFileForMigration = files.remove(0); + } + + storageCapacities = getStorageCapacities(storageCapacities, srcDataStoreId); + List orderedDS = migrationHelper.sortDataStores(storageCapacities); + Long destDatastoreId = orderedDS.get(0); + + if (chosenFileForMigration == null || destDatastoreId == null || (destDatastoreId == srcDatastore.getId() && migrationPolicy == MigrationPolicy.BALANCE) ) { + Pair result = migrateCompleted(destDatastoreId, srcDatastore, files, migrationPolicy); + message = result.first(); + success = result.second(); + break; + } + + if (migrationPolicy == MigrationPolicy.COMPLETE && destDatastoreId == srcDatastore.getId()) { + destDatastoreId = orderedDS.get(1); + } + + if (chosenFileForMigration.getSize() > storageCapacities.get(destDatastoreId).first()) { + s_logger.debug("file: " + chosenFileForMigration.getId() + " too large to be migrated to " + destDatastoreId); + continue; + } + + if (shouldMigrate(chosenFileForMigration, srcDatastore.getId(), destDatastoreId, storageCapacities, snapshotChains, migrationPolicy)) { + storageCapacities = migrateAway(chosenFileForMigration, storageCapacities, snapshotChains, srcDatastore, destDatastoreId, executor, futures); + } else { + if (migrationPolicy == MigrationPolicy.BALANCE) { + continue; + } + message = "Complete migration failed. Please set the source Image store to read-write mode if you want to continue using it"; + success = false; + break; + } + } + Date end = new Date(); + handleSnapshotMigration(srcDataStoreId, start, end, migrationPolicy, futures, storageCapacities, executor); + return handleResponse(futures, migrationPolicy, message, success); + } + + protected Pair migrateCompleted(Long destDatastoreId, DataStore srcDatastore, List files, MigrationPolicy migrationPolicy) { + String message = ""; + boolean success = true; + if (destDatastoreId == srcDatastore.getId() && !files.isEmpty()) { + if (migrationPolicy == MigrationPolicy.BALANCE) { + s_logger.debug("Migration completed : data stores have been balanced "); + if (destDatastoreId == srcDatastore.getId()) { + message = "Seems like source datastore has more free capacity than the destination(s)"; + } + message += "Image stores have been attempted to be balanced"; + success = true; + } else { + message = "Files not completely migrated from "+ srcDatastore.getId() + ". Datastore (source): " + srcDatastore.getId() + "has equal or more free space than destination."+ + " If you want to continue using the Image Store, please change the read-only status using 'update imagestore' command"; + success = false; + } + } else { + message = "Migration completed"; + } + return new Pair(message, success); + } + + protected Map> migrateAway(DataObject chosenFileForMigration, Map> storageCapacities, + Map, Long>> snapshotChains, DataStore srcDatastore, Long destDatastoreId, ThreadPoolExecutor executor, + List>> futures) { + Long fileSize = migrationHelper.getFileSize(chosenFileForMigration, snapshotChains); + storageCapacities = assumeMigrate(storageCapacities, srcDatastore.getId(), destDatastoreId, fileSize); + long activeSsvms = migrationHelper.activeSSVMCount(srcDatastore); + long totalJobs = activeSsvms * numConcurrentCopyTasksPerSSVM; + // Increase thread pool size with increase in number of SSVMs + if ( totalJobs > executor.getCorePoolSize()) { + executor.setMaximumPoolSize((int) (totalJobs)); + executor.setCorePoolSize((int) (totalJobs)); + } + + MigrateDataTask task = new MigrateDataTask(chosenFileForMigration, srcDatastore, dataStoreManager.getDataStore(destDatastoreId, DataStoreRole.Image)); + if (chosenFileForMigration instanceof SnapshotInfo ) { + task.setSnapshotChains(snapshotChains); + } + futures.add((executor.submit(task))); + s_logger.debug("Migration of file " + chosenFileForMigration.getId() + " is initiated"); + return storageCapacities; + } + + + + private MigrationResponse handleResponse(List>> futures, MigrationPolicy migrationPolicy, String message, boolean success) { + int successCount = 0; + for (Future> future : futures) { + try { + AsyncCallFuture res = future.get(); + if (res.get().isSuccess()) { + successCount++; + } + } catch ( InterruptedException | ExecutionException e) { + s_logger.warn("Failed to get result"); + continue; + } + } + message += ". successful migrations: "+successCount; + return new MigrationResponse(message, migrationPolicy.toString(), success); + } + + private void handleSnapshotMigration(Long srcDataStoreId, Date start, Date end, MigrationPolicy policy, + List>> futures, Map> storageCapacities, ThreadPoolExecutor executor) { + DataStore srcDatastore = dataStoreManager.getDataStore(srcDataStoreId, DataStoreRole.Image); + List snaps = snapshotDataStoreDao.findSnapshots(srcDataStoreId, start, end); + if (!snaps.isEmpty()) { + for (SnapshotDataStoreVO snap : snaps) { + SnapshotVO snapshotVO = snapshotDao.findById(snap.getSnapshotId()); + SnapshotInfo snapshotInfo = snapshotFactory.getSnapshot(snapshotVO.getSnapshotId(), DataStoreRole.Image); + SnapshotInfo parentSnapshot = snapshotInfo.getParent(); + + if (parentSnapshot == null && policy == MigrationPolicy.COMPLETE) { + List dstores = migrationHelper.sortDataStores(storageCapacities); + Long storeId = dstores.get(0); + if (storeId.equals(srcDataStoreId)) { + storeId = dstores.get(1); + } + DataStore datastore = dataStoreManager.getDataStore(storeId, DataStoreRole.Image); + futures.add(executor.submit(new MigrateDataTask(snapshotInfo, srcDatastore, datastore))); + } + if (parentSnapshot != null) { + DataStore parentDS = dataStoreManager.getDataStore(parentSnapshot.getDataStore().getId(), DataStoreRole.Image); + if (parentDS.getId() != snapshotInfo.getDataStore().getId()) { + futures.add(executor.submit(new MigrateDataTask(snapshotInfo, srcDatastore, parentDS))); + } + } + } + } + } + + private Map> getStorageCapacities(Map> storageCapacities, Long srcDataStoreId) { + Map> capacities = new Hashtable<>(); + for (Long storeId : storageCapacities.keySet()) { + StorageStats stats = statsCollector.getStorageStats(storeId); + if (stats != null) { + if (storageCapacities.get(storeId) == null || storageCapacities.get(storeId).first() == null || storageCapacities.get(storeId).second() == null) { + capacities.put(storeId, new Pair<>(stats.getCapacityBytes() - stats.getByteUsed(), stats.getCapacityBytes())); + } else { + long totalCapacity = stats.getCapacityBytes(); + Long freeCapacity = totalCapacity - stats.getByteUsed(); + if (storeId.equals(srcDataStoreId) || freeCapacity < storageCapacities.get(storeId).first()) { + capacities.put(storeId, new Pair<>(freeCapacity, totalCapacity)); + } else { + capacities.put(storeId, storageCapacities.get(storeId)); + } + } + } else { + throw new CloudRuntimeException("Stats Collector hasn't yet collected metrics from the Image store, kindly try again later"); + } + } + return capacities; + } + + + /** + * + * @param storageCapacities Map comprising the metrics(free and total capacities) of the images stores considered + * @return mean standard deviation + */ + private double getStandardDeviation(Map> storageCapacities) { + double[] freeCapacities = storageCapacities.values().stream().mapToDouble(x -> ((double) x.first() / x.second())).toArray(); + double mean = calculateStorageMean(freeCapacities); + return (calculateStorageStandardDeviation(freeCapacities, mean) / mean); + } + + /** + * + * @param storageCapacities Map comprising the metrics(free and total capacities) of the images stores considered + * @param srcDsId source image store ID from where data is to be migrated + * @param destDsId destination image store ID to where data is to be migrated + * @param fileSize size of the data object to be migrated so as to recompute the storage metrics + * @return a map - Key: Datastore ID ; Value: Pair + */ + private Map> assumeMigrate(Map> storageCapacities, Long srcDsId, Long destDsId, Long fileSize) { + Map> modifiedCapacities = new Hashtable<>(); + modifiedCapacities.putAll(storageCapacities); + Pair srcDSMetrics = storageCapacities.get(srcDsId); + Pair destDSMetrics = storageCapacities.get(destDsId); + modifiedCapacities.put(srcDsId, new Pair<>(srcDSMetrics.first() + fileSize, srcDSMetrics.second())); + modifiedCapacities.put(destDsId, new Pair<>(destDSMetrics.first() - fileSize, destDSMetrics.second())); + return modifiedCapacities; + } + + /** + * This function determines if migration should in fact take place or not : + * - For Balanced migration - the mean standard deviation is calculated before and after (supposed) migration + * and a decision is made if migration is afterall beneficial + * - For Complete migration - We check if the destination image store has sufficient capacity i.e., below the threshold of (90%) + * and then proceed with the migration + * @param chosenFile file for migration + * @param srcDatastoreId source image store ID from where data is to be migrated + * @param destDatastoreId destination image store ID to where data is to be migrated + * @param storageCapacities Map comprising the metrics(free and total capacities) of the images stores considered + * @param snapshotChains Map containing details of chain of snapshots and their cumulative size + * @param migrationPolicy determines whether a "Balance" or "Complete" migration operation is to be performed + * @return + */ + private boolean shouldMigrate(DataObject chosenFile, Long srcDatastoreId, Long destDatastoreId, Map> storageCapacities, + Map, Long>> snapshotChains, MigrationPolicy migrationPolicy) { + + if (migrationPolicy == MigrationPolicy.BALANCE) { + double meanStdDevCurrent = getStandardDeviation(storageCapacities); + + Long fileSize = migrationHelper.getFileSize(chosenFile, snapshotChains); + Map> proposedCapacities = assumeMigrate(storageCapacities, srcDatastoreId, destDatastoreId, fileSize); + double meanStdDevAfter = getStandardDeviation(proposedCapacities); + + if (meanStdDevAfter > meanStdDevCurrent) { + s_logger.debug("migrating the file doesn't prove to be beneficial, skipping migration"); + return false; + } + + Double threshold = ImageStoreImbalanceThreshold.value(); + if (meanStdDevCurrent > threshold && storageCapacityBelowThreshold(storageCapacities, destDatastoreId)) { + return true; + } + return true; + } else { + if (storageCapacityBelowThreshold(storageCapacities, destDatastoreId)) { + return true; + } + } + return false; + } + + private boolean storageCapacityBelowThreshold(Map> storageCapacities, Long destStoreId) { + Pair imageStoreCapacity = storageCapacities.get(destStoreId); + if (imageStoreCapacity != null && (imageStoreCapacity.first() / (imageStoreCapacity.second() * 1.0)) <= imageStoreCapacityThreshold) { + s_logger.debug("image store: " + destStoreId + " has sufficient capacity to proceed with migration of file"); + return true; + } + s_logger.debug("Image store capacity threshold exceeded, migration not possible"); + return false; + } + + private double calculateStorageMean(double[] storageMetrics) { + return new Mean().evaluate(storageMetrics); + } + + private double calculateStorageStandardDeviation(double[] metricValues, double mean) { + StandardDeviation standardDeviation = new StandardDeviation(false); + return standardDeviation.evaluate(metricValues, mean); + } + + private class MigrateDataTask implements Callable> { + private DataObject file; + private DataStore srcDataStore; + private DataStore destDataStore; + private Map, Long>> snapshotChain; + public MigrateDataTask(DataObject file, DataStore srcDataStore, DataStore destDataStore) { + this.file = file; + this.srcDataStore = srcDataStore; + this.destDataStore = destDataStore; + } + + public void setSnapshotChains(Map, Long>> snapshotChain) { + this.snapshotChain = snapshotChain; + } + + public Map, Long>> getSnapshotChain() { + return snapshotChain; + } + public DataObject getFile() { + return file; + } + + @Override + public AsyncCallFuture call() throws Exception { + return secStgSrv.migrateData(file, srcDataStore, destDataStore, snapshotChain); + } + } +} diff --git a/engine/orchestration/src/main/resources/META-INF/cloudstack/core/spring-engine-orchestration-core-context.xml b/engine/orchestration/src/main/resources/META-INF/cloudstack/core/spring-engine-orchestration-core-context.xml index 3ded395bb66f..66335a6b0579 100644 --- a/engine/orchestration/src/main/resources/META-INF/cloudstack/core/spring-engine-orchestration-core-context.xml +++ b/engine/orchestration/src/main/resources/META-INF/cloudstack/core/spring-engine-orchestration-core-context.xml @@ -44,6 +44,11 @@ value="#{storagePoolAllocatorsRegistry.registered}" /> + + + , StateDao, StateDao listByHostCapability(Host.Type type, Long clusterId, Long podId, long dcId, String hostCapabilty); List listByClusterAndHypervisorType(long clusterId, HypervisorType hypervisorType); + + HostVO findByName(String name); } diff --git a/engine/schema/src/main/java/com/cloud/host/dao/HostDaoImpl.java b/engine/schema/src/main/java/com/cloud/host/dao/HostDaoImpl.java index d28357d39e7c..75304c1b2741 100644 --- a/engine/schema/src/main/java/com/cloud/host/dao/HostDaoImpl.java +++ b/engine/schema/src/main/java/com/cloud/host/dao/HostDaoImpl.java @@ -107,6 +107,7 @@ public class HostDaoImpl extends GenericDaoBase implements HostDao protected SearchBuilder UnmanagedApplianceSearch; protected SearchBuilder MaintenanceCountSearch; protected SearchBuilder HostTypeCountSearch; + protected SearchBuilder HostTypeZoneCountSearch; protected SearchBuilder ClusterStatusSearch; protected SearchBuilder TypeNameZoneSearch; protected SearchBuilder AvailHypevisorInZone; @@ -167,6 +168,12 @@ public void init() { HostTypeCountSearch.and("removed", HostTypeCountSearch.entity().getRemoved(), SearchCriteria.Op.NULL); HostTypeCountSearch.done(); + HostTypeZoneCountSearch = createSearchBuilder(); + HostTypeZoneCountSearch.and("type", HostTypeZoneCountSearch.entity().getType(), SearchCriteria.Op.EQ); + HostTypeZoneCountSearch.and("dc", HostTypeZoneCountSearch.entity().getDataCenterId(), SearchCriteria.Op.EQ); + HostTypeZoneCountSearch.and("removed", HostTypeZoneCountSearch.entity().getRemoved(), SearchCriteria.Op.NULL); + HostTypeZoneCountSearch.done(); + TypePodDcStatusSearch = createSearchBuilder(); HostVO entity = TypePodDcStatusSearch.entity(); TypePodDcStatusSearch.and("type", entity.getType(), SearchCriteria.Op.EQ); @@ -447,6 +454,14 @@ public Integer countAllByType(final Host.Type type) { return getCount(sc); } + @Override + public Integer countAllByTypeInZone(long zoneId, Type type) { + SearchCriteria sc = HostTypeCountSearch.create(); + sc.setParameters("type", type); + sc.setParameters("dc", zoneId); + return getCount(sc); + } + @Override public List listByDataCenterId(long id) { SearchCriteria sc = DcSearch.create(); @@ -1261,6 +1276,13 @@ public List listByClusterAndHypervisorType(long clusterId, HypervisorTyp return listBy(sc); } + @Override + public HostVO findByName(String name) { + SearchCriteria sc = NameSearch.create(); + sc.setParameters("name", name); + return findOneBy(sc); + } + private ResultSet executeSqlGetResultsetForMethodFindHostInZoneToExecuteCommand(HypervisorType hypervisorType, long zoneId, TransactionLegacy tx, String sql) throws SQLException { PreparedStatement pstmt = tx.prepareAutoCloseStatement(sql); pstmt.setString(1, Objects.toString(hypervisorType)); diff --git a/engine/schema/src/main/java/com/cloud/secstorage/CommandExecLogDao.java b/engine/schema/src/main/java/com/cloud/secstorage/CommandExecLogDao.java index fb57563131e6..98fc8c8687b8 100644 --- a/engine/schema/src/main/java/com/cloud/secstorage/CommandExecLogDao.java +++ b/engine/schema/src/main/java/com/cloud/secstorage/CommandExecLogDao.java @@ -22,4 +22,5 @@ public interface CommandExecLogDao extends GenericDao { public void expungeExpiredRecords(Date cutTime); + public Integer getCopyCmdCountForSSVM(Long id); } diff --git a/engine/schema/src/main/java/com/cloud/secstorage/CommandExecLogDaoImpl.java b/engine/schema/src/main/java/com/cloud/secstorage/CommandExecLogDaoImpl.java index ac438b0d1173..f89a1bbf4ccb 100644 --- a/engine/schema/src/main/java/com/cloud/secstorage/CommandExecLogDaoImpl.java +++ b/engine/schema/src/main/java/com/cloud/secstorage/CommandExecLogDaoImpl.java @@ -17,7 +17,7 @@ package com.cloud.secstorage; import java.util.Date; - +import java.util.List; import org.springframework.stereotype.Component; @@ -30,11 +30,16 @@ public class CommandExecLogDaoImpl extends GenericDaoBase implements CommandExecLogDao { protected final SearchBuilder ExpungeSearch; + protected final SearchBuilder CommandSearch; public CommandExecLogDaoImpl() { ExpungeSearch = createSearchBuilder(); ExpungeSearch.and("created", ExpungeSearch.entity().getCreated(), Op.LT); ExpungeSearch.done(); + + CommandSearch = createSearchBuilder(); + CommandSearch.and("host_id", CommandSearch.entity().getHostId(), Op.EQ); + CommandSearch.and("command_name", CommandSearch.entity().getCommandName(), Op.EQ); } @Override @@ -43,4 +48,13 @@ public void expungeExpiredRecords(Date cutTime) { sc.setParameters("created", cutTime); expunge(sc); } + + @Override + public Integer getCopyCmdCountForSSVM(Long id) { + SearchCriteria sc = CommandSearch.create(); + sc.setParameters("host_id", id); + sc.setParameters("command_name", "CopyCommand"); + List copyCmds = customSearch(sc, null); + return copyCmds.size(); + } } diff --git a/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/ImageStoreDao.java b/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/ImageStoreDao.java index 1861b21a38ad..84cba70e8617 100644 --- a/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/ImageStoreDao.java +++ b/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/ImageStoreDao.java @@ -29,7 +29,7 @@ public interface ImageStoreDao extends GenericDao { List findByProvider(String provider); - List findByScope(ZoneScope scope); + List findByZone(ZoneScope scope, Boolean readonly); List findRegionImageStores(); diff --git a/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/ImageStoreDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/ImageStoreDaoImpl.java index 38124ea49e0e..6ecac5ed8094 100644 --- a/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/ImageStoreDaoImpl.java +++ b/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/ImageStoreDaoImpl.java @@ -77,9 +77,12 @@ public List findByProvider(String provider) { } @Override - public List findByScope(ZoneScope scope) { + public List findByZone(ZoneScope scope, Boolean readonly) { SearchCriteria sc = createSearchCriteria(); sc.addAnd("role", SearchCriteria.Op.EQ, DataStoreRole.Image); + if (readonly != null) { + sc.addAnd("readonly", SearchCriteria.Op.EQ, readonly); + } if (scope.getScopeId() != null) { SearchCriteria scc = createSearchCriteria(); scc.addOr("scope", SearchCriteria.Op.EQ, ScopeType.REGION); diff --git a/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/ImageStoreVO.java b/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/ImageStoreVO.java index 2c706774a4d8..d24582714868 100644 --- a/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/ImageStoreVO.java +++ b/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/ImageStoreVO.java @@ -74,6 +74,9 @@ public class ImageStoreVO implements ImageStore { @Enumerated(value = EnumType.STRING) private DataStoreRole role; + @Column(name = "readonly") + private boolean readonly = false; + @Column(name = "parent") private String parent; @@ -165,6 +168,14 @@ public Date getCreated() { return created; } + public void setReadonly(boolean readonly) { + this.readonly = readonly; + } + + public boolean isReadonly() { + return readonly; + } + public void setCreated(Date created) { this.created = created; } diff --git a/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/SnapshotDataStoreDao.java b/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/SnapshotDataStoreDao.java index 91ea07c5860b..3263cbb5b1a0 100644 --- a/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/SnapshotDataStoreDao.java +++ b/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/SnapshotDataStoreDao.java @@ -16,6 +16,7 @@ // under the License. package org.apache.cloudstack.storage.datastore.db; +import java.util.Date; import java.util.List; import org.apache.cloudstack.engine.subsystem.api.storage.DataObjectInStore; @@ -42,6 +43,8 @@ public interface SnapshotDataStoreDao extends GenericDao listDestroyed(long storeId); List findBySnapshotId(long snapshotId); @@ -72,5 +75,7 @@ public interface SnapshotDataStoreDao extends GenericDao listByState(ObjectInDataStoreStateMachine.State... states); + List findSnapshots(Long storeId, Date start, Date end); + SnapshotDataStoreVO findDestroyedReferenceBySnapshot(long snapshotId, DataStoreRole role); } diff --git a/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreDao.java b/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreDao.java index a6e609e7d870..fc695f476779 100644 --- a/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreDao.java +++ b/engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/TemplateDataStoreDao.java @@ -66,6 +66,8 @@ public interface TemplateDataStoreDao extends GenericDao listByTemplate(long templateId); + List listByTemplateNotBypassed(long templateId); + TemplateDataStoreVO findByTemplateZoneReady(long templateId, Long zoneId); void duplicateCacheRecordsOnRegionStore(long storeId); diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41310to41400.sql b/engine/schema/src/main/resources/META-INF/db/schema-41310to41400.sql index baa7bcf96178..a1a2e742b0c1 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-41310to41400.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-41310to41400.sql @@ -53,6 +53,33 @@ ALTER TABLE `cloud`.`vm_instance` ADD COLUMN `backup_offering_id` bigint unsigne ALTER TABLE `cloud`.`vm_instance` ADD COLUMN `backup_external_id` varchar(255) DEFAULT NULL COMMENT 'ID of external backup job or container if any'; ALTER TABLE `cloud`.`vm_instance` ADD COLUMN `backup_volumes` text DEFAULT NULL COMMENT 'details of backedup volumes'; +ALTER TABLE `cloud`.`image_store` ADD COLUMN `readonly` boolean DEFAULT false COMMENT 'defines status of image store'; + +ALTER VIEW `cloud`.`image_store_view` AS + select + image_store.id, + image_store.uuid, + image_store.name, + image_store.image_provider_name, + image_store.protocol, + image_store.url, + image_store.scope, + image_store.role, + image_store.readonly, + image_store.removed, + data_center.id data_center_id, + data_center.uuid data_center_uuid, + data_center.name data_center_name, + image_store_details.name detail_name, + image_store_details.value detail_value + from + `cloud`.`image_store` + left join + `cloud`.`data_center` ON image_store.data_center_id = data_center.id + left join + `cloud`.`image_store_details` ON image_store_details.store_id = image_store.id; + + CREATE TABLE IF NOT EXISTS `cloud`.`backups` ( `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, `uuid` varchar(40) NOT NULL UNIQUE, diff --git a/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/DataMotionServiceImpl.java b/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/DataMotionServiceImpl.java index c2724e648241..ac6c8555da96 100644 --- a/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/DataMotionServiceImpl.java +++ b/engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/DataMotionServiceImpl.java @@ -25,12 +25,6 @@ import javax.inject.Inject; -import com.cloud.storage.Volume; -import com.cloud.storage.VolumeVO; -import com.cloud.storage.dao.VolumeDao; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; - import org.apache.cloudstack.engine.subsystem.api.storage.CopyCommandResult; import org.apache.cloudstack.engine.subsystem.api.storage.DataMotionService; import org.apache.cloudstack.engine.subsystem.api.storage.DataMotionStrategy; @@ -39,9 +33,14 @@ import org.apache.cloudstack.engine.subsystem.api.storage.StorageStrategyFactory; import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo; import org.apache.cloudstack.framework.async.AsyncCompletionCallback; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.agent.api.to.VirtualMachineTO; import com.cloud.host.Host; +import com.cloud.storage.Volume; +import com.cloud.storage.VolumeVO; +import com.cloud.storage.dao.VolumeDao; import com.cloud.utils.StringUtils; import com.cloud.utils.exception.CloudRuntimeException; diff --git a/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/SecondaryStorageServiceImpl.java b/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/SecondaryStorageServiceImpl.java new file mode 100644 index 000000000000..5a9c4a9f12ea --- /dev/null +++ b/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/SecondaryStorageServiceImpl.java @@ -0,0 +1,203 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package org.apache.cloudstack.storage.image; + +import java.util.List; +import java.util.Map; +import java.util.concurrent.ExecutionException; + +import javax.inject.Inject; + +import org.apache.cloudstack.engine.subsystem.api.storage.CopyCommandResult; +import org.apache.cloudstack.engine.subsystem.api.storage.DataMotionService; +import org.apache.cloudstack.engine.subsystem.api.storage.DataObject; +import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; +import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine; +import org.apache.cloudstack.engine.subsystem.api.storage.SecondaryStorageService; +import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotInfo; +import org.apache.cloudstack.engine.subsystem.api.storage.TemplateInfo; +import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo; +import org.apache.cloudstack.framework.async.AsyncCallFuture; +import org.apache.cloudstack.framework.async.AsyncCallbackDispatcher; +import org.apache.cloudstack.framework.async.AsyncCompletionCallback; +import org.apache.cloudstack.framework.async.AsyncRpcContext; +import org.apache.cloudstack.storage.command.CopyCmdAnswer; +import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreDao; +import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreVO; +import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao; +import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO; + +import org.apache.cloudstack.storage.datastore.db.VolumeDataStoreDao; +import org.apache.cloudstack.storage.datastore.db.VolumeDataStoreVO; +import org.apache.log4j.Logger; + +import com.cloud.secstorage.CommandExecLogDao; +import com.cloud.storage.DataStoreRole; +import com.cloud.utils.Pair; + +public class SecondaryStorageServiceImpl implements SecondaryStorageService { + + private static final Logger s_logger = Logger.getLogger(SecondaryStorageServiceImpl.class); + + @Inject + DataMotionService motionSrv; + @Inject + CommandExecLogDao _cmdExecLogDao; + @Inject + TemplateDataStoreDao templateStoreDao; + @Inject + SnapshotDataStoreDao snapshotStoreDao; + @Inject + VolumeDataStoreDao volumeDataStoreDao; + + private class MigrateDataContext extends AsyncRpcContext { + final DataObject srcData; + final DataObject destData; + final AsyncCallFuture future; + + /** + * @param callback + */ + public MigrateDataContext(AsyncCompletionCallback callback, AsyncCallFuture future, DataObject srcData, DataObject destData, DataStore destStore) { + super(callback); + this.srcData = srcData; + this.destData = destData; + this.future = future; + } + } + + @Override + public AsyncCallFuture migrateData(DataObject srcDataObject, DataStore srcDatastore, DataStore destDatastore, Map, Long>> snapshotChain) { + AsyncCallFuture future = new AsyncCallFuture(); + DataObjectResult res = new DataObjectResult(srcDataObject); + DataObject destDataObject = null; + try { + if (srcDataObject instanceof SnapshotInfo && snapshotChain != null && snapshotChain.containsKey(srcDataObject)) { + for (SnapshotInfo snapshotInfo : snapshotChain.get(srcDataObject).first()) { + destDataObject = destDatastore.create(snapshotInfo); + snapshotInfo.processEvent(ObjectInDataStoreStateMachine.Event.MigrateDataRequested); + destDataObject.processEvent(ObjectInDataStoreStateMachine.Event.MigrateDataRequested); + migrateJob(future, snapshotInfo, destDataObject, destDatastore); + } + } else { + // Check if template in destination store, if yes, do not proceed + if (srcDataObject instanceof TemplateInfo) { + s_logger.debug("Checking if template present at destination"); + TemplateDataStoreVO templateStoreVO = templateStoreDao.findByStoreTemplate(destDatastore.getId(), srcDataObject.getId()); + if (templateStoreVO != null) { + String msg = "Template already exists in destination store"; + s_logger.debug(msg); + res.setResult(msg); + res.setSuccess(true); + future.complete(res); + return future; + } + } + destDataObject = destDatastore.create(srcDataObject); + srcDataObject.processEvent(ObjectInDataStoreStateMachine.Event.MigrateDataRequested); + destDataObject.processEvent(ObjectInDataStoreStateMachine.Event.MigrateDataRequested); + migrateJob(future, srcDataObject, destDataObject, destDatastore); + } + } catch (Exception e) { + s_logger.debug("Failed to copy Data", e); + if (destDataObject != null) { + destDataObject.getDataStore().delete(destDataObject); + } + if (!(srcDataObject instanceof VolumeInfo)) { + srcDataObject.processEvent(ObjectInDataStoreStateMachine.Event.OperationFailed); + } else { + ((VolumeInfo) srcDataObject).processEventOnly(ObjectInDataStoreStateMachine.Event.OperationFailed); + } + res.setResult(e.toString()); + future.complete(res); + } + return future; + } + + protected void migrateJob(AsyncCallFuture future, DataObject srcDataObject, DataObject destDataObject, DataStore destDatastore) throws ExecutionException, InterruptedException { + MigrateDataContext context = new MigrateDataContext(null, future, srcDataObject, destDataObject, destDatastore); + AsyncCallbackDispatcher caller = AsyncCallbackDispatcher.create(this); + caller.setCallback(caller.getTarget().migrateDataCallBack(null, null)).setContext(context); + motionSrv.copyAsync(srcDataObject, destDataObject, caller); + } + + /** + * Callback function to handle state change of source and destination data objects based on the success or failure of the migrate task + */ + protected Void migrateDataCallBack(AsyncCallbackDispatcher callback, MigrateDataContext context) throws ExecutionException, InterruptedException { + DataObject srcData = context.srcData; + DataObject destData = context.destData; + CopyCommandResult result = callback.getResult(); + AsyncCallFuture future = context.future; + DataObjectResult res = new DataObjectResult(srcData); + CopyCmdAnswer answer = (CopyCmdAnswer) result.getAnswer(); + try { + if (!answer.getResult()) { + s_logger.warn("Migration failed for "+srcData.getUuid()); + res.setResult(result.getResult()); + if (!(srcData instanceof VolumeInfo) ) { + srcData.processEvent(ObjectInDataStoreStateMachine.Event.OperationFailed); + destData.processEvent(ObjectInDataStoreStateMachine.Event.MigrationFailed); + destData.processEvent(ObjectInDataStoreStateMachine.Event.DestroyRequested); + } else { + ((VolumeInfo)srcData).processEventOnly(ObjectInDataStoreStateMachine.Event.OperationFailed); + ((VolumeInfo)destData).processEventOnly(ObjectInDataStoreStateMachine.Event.MigrationFailed); + ((VolumeInfo)destData).processEventOnly(ObjectInDataStoreStateMachine.Event.DestroyRequested); + } + + if (destData != null) { + destData.getDataStore().delete(destData); + } + + } else { + if (destData instanceof VolumeInfo) { + ((VolumeInfo) destData).processEventOnly(ObjectInDataStoreStateMachine.Event.OperationSuccessed, answer); + } else { + destData.processEvent(ObjectInDataStoreStateMachine.Event.OperationSuccessed, answer); + } + if (destData instanceof SnapshotInfo) { + SnapshotDataStoreVO snapshotStore = snapshotStoreDao.findBySourceSnapshot(srcData.getId(), DataStoreRole.Image); + SnapshotDataStoreVO destSnapshotStore = snapshotStoreDao.findBySnapshot(srcData.getId(), DataStoreRole.Image); + destSnapshotStore.setPhysicalSize(snapshotStore.getPhysicalSize()); + snapshotStoreDao.update(destSnapshotStore.getId(), destSnapshotStore); + } + + if (destData instanceof VolumeInfo) { + VolumeDataStoreVO srcVolume = volumeDataStoreDao.findByStoreVolume(srcData.getDataStore().getId(), srcData.getId()); + VolumeDataStoreVO destVolume = volumeDataStoreDao.findByStoreVolume(destData.getDataStore().getId(), destData.getId()); + destVolume.setPhysicalSize(srcVolume.getPhysicalSize()); + volumeDataStoreDao.update(destVolume.getId(), destVolume); + } + s_logger.debug("Deleting source data"); + srcData.getDataStore().delete(srcData); + s_logger.debug("Successfully migrated "+srcData.getUuid()); + } + _cmdExecLogDao.expunge(Long.parseLong(answer.getContextParam("cmd"))); + future.complete(res); + } catch (Exception e) { + s_logger.error("Failed to process migrate data callback", e); + res.setResult(e.toString()); + _cmdExecLogDao.expunge(Long.parseLong(answer.getContextParam("cmd"))); + future.complete(res); + } + return null; + } + +} + + diff --git a/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateDataFactoryImpl.java b/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateDataFactoryImpl.java index 8343a74d60b7..043af9a49ac9 100644 --- a/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateDataFactoryImpl.java +++ b/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateDataFactoryImpl.java @@ -18,21 +18,17 @@ */ package org.apache.cloudstack.storage.image; -import com.cloud.host.HostVO; -import com.cloud.host.dao.HostDao; import java.util.ArrayList; import java.util.List; import javax.inject.Inject; -import com.cloud.hypervisor.Hypervisor; -import com.cloud.utils.exception.CloudRuntimeException; import org.apache.cloudstack.direct.download.DirectDownloadManager; import org.apache.cloudstack.engine.subsystem.api.storage.DataObject; import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; +import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; import org.apache.cloudstack.engine.subsystem.api.storage.TemplateDataFactory; import org.apache.cloudstack.engine.subsystem.api.storage.TemplateInfo; -import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao; @@ -41,11 +37,15 @@ import org.apache.log4j.Logger; import org.springframework.stereotype.Component; +import com.cloud.host.HostVO; +import com.cloud.host.dao.HostDao; +import com.cloud.hypervisor.Hypervisor; import com.cloud.storage.DataStoreRole; import com.cloud.storage.VMTemplateStoragePoolVO; import com.cloud.storage.VMTemplateVO; import com.cloud.storage.dao.VMTemplateDao; import com.cloud.storage.dao.VMTemplatePoolDao; +import com.cloud.utils.exception.CloudRuntimeException; @Component public class TemplateDataFactoryImpl implements TemplateDataFactory { @@ -230,5 +230,4 @@ public boolean isTemplateMarkedForDirectDownload(long templateId) { VMTemplateVO templateVO = imageDataDao.findById(templateId); return templateVO.isDirectDownload(); } - } diff --git a/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateServiceImpl.java b/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateServiceImpl.java index ee056309f793..00bc7e4208b2 100644 --- a/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateServiceImpl.java +++ b/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateServiceImpl.java @@ -253,7 +253,7 @@ public void downloadBootstrapSysTemplate(DataStore store) { @Override public void handleSysTemplateDownload(HypervisorType hostHyper, Long dcId) { Set toBeDownloaded = new HashSet(); - List stores = _storeMgr.getImageStoresByScope(new ZoneScope(dcId)); + List stores = _storeMgr.getImageStoresByScopeExcludingReadOnly(new ZoneScope(dcId)); if (stores == null || stores.isEmpty()) { return; } diff --git a/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/manager/ImageStoreProviderManagerImpl.java b/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/manager/ImageStoreProviderManagerImpl.java index 80e5b38f1f76..1ca155cb7d9e 100644 --- a/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/manager/ImageStoreProviderManagerImpl.java +++ b/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/manager/ImageStoreProviderManagerImpl.java @@ -33,6 +33,9 @@ import org.apache.cloudstack.engine.subsystem.api.storage.ImageStoreProvider; import org.apache.cloudstack.engine.subsystem.api.storage.Scope; import org.apache.cloudstack.engine.subsystem.api.storage.ZoneScope; +import org.apache.cloudstack.framework.config.ConfigKey; +import org.apache.cloudstack.framework.config.Configurable; +import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.storage.datastore.db.ImageStoreDao; import org.apache.cloudstack.storage.datastore.db.ImageStoreVO; import org.apache.cloudstack.storage.image.ImageStoreDriver; @@ -47,7 +50,7 @@ import com.cloud.storage.dao.VMTemplateDao; @Component -public class ImageStoreProviderManagerImpl implements ImageStoreProviderManager { +public class ImageStoreProviderManagerImpl implements ImageStoreProviderManager, Configurable { private static final Logger s_logger = Logger.getLogger(ImageStoreProviderManagerImpl.class); @Inject ImageStoreDao dataStoreDao; @@ -57,8 +60,14 @@ public class ImageStoreProviderManagerImpl implements ImageStoreProviderManager DataStoreProviderManager providerManager; @Inject StatsCollector _statsCollector; + @Inject + ConfigurationDao configDao; + Map driverMaps; + static final ConfigKey ImageStoreAllocationAlgorithm = new ConfigKey("Advanced", String.class, "image.store.allocation.algorithm", "firstfitleastconsumed", + "firstfitleastconsumed','random' : Order in which hosts within a cluster will be considered for VM/volume allocation", true, ConfigKey.Scope.Global ); + @PostConstruct public void config() { driverMaps = new HashMap(); @@ -110,7 +119,7 @@ public List listImageCacheStores() { @Override public List listImageStoresByScope(ZoneScope scope) { - List stores = dataStoreDao.findByScope(scope); + List stores = dataStoreDao.findByZone(scope, null); List imageStores = new ArrayList(); for (ImageStoreVO store : stores) { imageStores.add(getImageStore(store.getId())); @@ -118,6 +127,24 @@ public List listImageStoresByScope(ZoneScope scope) { return imageStores; } + @Override + public List listImageStoresByScopeExcludingReadOnly(ZoneScope scope) { + String allocationAlgorithm = ImageStoreAllocationAlgorithm.value(); + + List stores = dataStoreDao.findByZone(scope, Boolean.FALSE); + List imageStores = new ArrayList(); + for (ImageStoreVO store : stores) { + imageStores.add(getImageStore(store.getId())); + } + if (allocationAlgorithm.equals("random")) { + Collections.shuffle(imageStores); + return imageStores; + } else if (allocationAlgorithm.equals("firstfitleastconsumed")) { + return orderImageStoresOnFreeCapacity(imageStores); + } + return null; + } + @Override public List listImageStoreByProvider(String provider) { List stores = dataStoreDao.findByProvider(provider); @@ -178,6 +205,31 @@ public int compare(DataStore store1, DataStore store2) { return null; } + @Override + public List orderImageStoresOnFreeCapacity(List imageStores) { + List stores = new ArrayList<>(); + if (imageStores.size() > 1) { + imageStores.sort(new Comparator() { // Sort data stores based on free capacity + @Override + public int compare(DataStore store1, DataStore store2) { + return Long.compare(_statsCollector.imageStoreCurrentFreeCapacity(store1), + _statsCollector.imageStoreCurrentFreeCapacity(store2)); + } + }); + for (DataStore imageStore : imageStores) { + // Return image store if used percentage is less then threshold value i.e. 90%. + if (_statsCollector.imageStoreHasEnoughCapacity(imageStore)) { + stores.add(imageStore); + } + } + } else if (imageStores.size() == 1) { + if (_statsCollector.imageStoreHasEnoughCapacity(imageStores.get(0))) { + stores.add(imageStores.get(0)); + } + } + return stores; + } + @Override public List listImageStoresWithFreeCapacity(List imageStores) { List stores = new ArrayList<>(); @@ -195,4 +247,14 @@ public List listImageStoresWithFreeCapacity(List imageStor } return stores; } + + @Override + public String getConfigComponentName() { + return ImageStoreProviderManager.class.getSimpleName(); + } + + @Override + public ConfigKey[] getConfigKeys() { + return new ConfigKey[] { ImageStoreAllocationAlgorithm }; + } } diff --git a/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/store/TemplateObject.java b/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/store/TemplateObject.java index 25f27a23c1ed..86030f226f63 100644 --- a/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/store/TemplateObject.java +++ b/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/store/TemplateObject.java @@ -208,7 +208,9 @@ public void processEvent(ObjectInDataStoreStateMachine.Event event, Answer answe CopyCmdAnswer cpyAnswer = (CopyCmdAnswer)answer; TemplateObjectTO newTemplate = (TemplateObjectTO)cpyAnswer.getNewData(); TemplateDataStoreVO templateStoreRef = templateStoreDao.findByStoreTemplate(getDataStore().getId(), getId()); - templateStoreRef.setInstallPath(newTemplate.getPath()); + if (newTemplate.getPath() != null) { + templateStoreRef.setInstallPath(newTemplate.getPath()); + } templateStoreRef.setDownloadPercent(100); templateStoreRef.setDownloadState(Status.DOWNLOADED); templateStoreRef.setSize(newTemplate.getSize()); diff --git a/engine/storage/image/src/main/resources/META-INF/cloudstack/core/spring-engine-storage-image-core-context.xml b/engine/storage/image/src/main/resources/META-INF/cloudstack/core/spring-engine-storage-image-core-context.xml index 5c7b05b756a1..805af26324bc 100644 --- a/engine/storage/image/src/main/resources/META-INF/cloudstack/core/spring-engine-storage-image-core-context.xml +++ b/engine/storage/image/src/main/resources/META-INF/cloudstack/core/spring-engine-storage-image-core-context.xml @@ -34,6 +34,10 @@ + + - + diff --git a/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotObject.java b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotObject.java index 65d6fa52e667..f107343f0def 100644 --- a/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotObject.java +++ b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/SnapshotObject.java @@ -18,12 +18,12 @@ */ package org.apache.cloudstack.storage.snapshot; +import java.util.ArrayList; import java.util.Date; +import java.util.List; import javax.inject.Inject; -import org.apache.log4j.Logger; - import org.apache.cloudstack.engine.subsystem.api.storage.DataObjectInStore; import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine; @@ -40,6 +40,7 @@ import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreDao; import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreVO; import org.apache.cloudstack.storage.to.SnapshotObjectTO; +import org.apache.log4j.Logger; import com.cloud.agent.api.Answer; import com.cloud.agent.api.to.DataObjectType; @@ -129,6 +130,24 @@ public SnapshotInfo getChild() { return snapshotFactory.getSnapshot(vo.getId(), store); } + @Override + public List getChildren() { + QueryBuilder sc = QueryBuilder.create(SnapshotDataStoreVO.class); + sc.and(sc.entity().getDataStoreId(), Op.EQ, store.getId()); + sc.and(sc.entity().getRole(), Op.EQ, store.getRole()); + sc.and(sc.entity().getState(), Op.NIN, State.Destroying, State.Destroyed, State.Error); + sc.and(sc.entity().getParentSnapshotId(), Op.EQ, getId()); + List vos = sc.list(); + + List children = new ArrayList<>(); + if (vos != null) { + for (SnapshotDataStoreVO vo : vos) { + children.add(snapshotFactory.getSnapshot(vo.getSnapshotId(), DataStoreRole.Image)); + } + } + return children; + } + @Override public boolean isRevertable() { SnapshotStrategy snapshotStrategy = storageStrategyFactory.getSnapshotStrategy(snapshot, SnapshotOperation.REVERT); diff --git a/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/DataStoreManagerImpl.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/DataStoreManagerImpl.java index 51421e4cd3dd..ff6c4fb5c6a7 100644 --- a/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/DataStoreManagerImpl.java +++ b/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/DataStoreManagerImpl.java @@ -72,6 +72,11 @@ public List getImageStoresByScope(ZoneScope scope) { return imageDataStoreMgr.listImageStoresByScope(scope); } + @Override + public List getImageStoresByScopeExcludingReadOnly(ZoneScope scope) { + return imageDataStoreMgr.listImageStoresByScopeExcludingReadOnly(scope); + } + @Override public DataStore getRandomImageStore(long zoneId) { List stores = getImageStoresByScope(new ZoneScope(zoneId)); @@ -81,18 +86,35 @@ public DataStore getRandomImageStore(long zoneId) { return imageDataStoreMgr.getRandomImageStore(stores); } + @Override + public DataStore getRandomUsableImageStore(long zoneId) { + List stores = getImageStoresByScopeExcludingReadOnly(new ZoneScope(zoneId)); + if (stores == null || stores.size() == 0) { + return null; + } + return imageDataStoreMgr.getRandomImageStore(stores); + } + @Override public DataStore getImageStoreWithFreeCapacity(long zoneId) { - List stores = getImageStoresByScope(new ZoneScope(zoneId)); + List stores = getImageStoresByScopeExcludingReadOnly(new ZoneScope(zoneId)); if (stores == null || stores.size() == 0) { return null; } return imageDataStoreMgr.getImageStoreWithFreeCapacity(stores); } + @Override + public DataStore getImageStoreWithFreeCapacity(List imageStores) { + if (imageStores.isEmpty()) { + return null; + } + return imageDataStoreMgr.getImageStoreWithFreeCapacity(imageStores); + } + @Override public List listImageStoresWithFreeCapacity(long zoneId) { - List stores = getImageStoresByScope(new ZoneScope(zoneId)); + List stores = getImageStoresByScopeExcludingReadOnly(new ZoneScope(zoneId)); if (stores == null || stores.size() == 0) { return null; } diff --git a/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java index 062e89a4247f..ff8112cceff9 100644 --- a/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java +++ b/engine/storage/src/main/java/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java @@ -104,6 +104,14 @@ public ObjectInDataStoreManagerImpl() { // TODO: further investigate why an extra event is sent when it is // alreay Ready for DownloadListener stateMachines.addTransition(State.Ready, Event.OperationSuccessed, State.Ready); + // State transitions for data object migration + stateMachines.addTransition(State.Ready, Event.MigrateDataRequested, State.Migrating); + stateMachines.addTransition(State.Ready, Event.CopyRequested, State.Copying); + stateMachines.addTransition(State.Allocated, Event.MigrateDataRequested, State.Migrating); + stateMachines.addTransition(State.Migrating, Event.MigrationFailed, State.Failed); + stateMachines.addTransition(State.Migrating, Event.MigrationSucceeded, State.Destroyed); + stateMachines.addTransition(State.Migrating, Event.OperationSuccessed, State.Ready); + stateMachines.addTransition(State.Migrating, Event.OperationFailed, State.Ready); } @Override diff --git a/engine/storage/src/main/java/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java index 6e8bdaf4b8c1..09b4b1ab3853 100644 --- a/engine/storage/src/main/java/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java +++ b/engine/storage/src/main/java/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java @@ -264,6 +264,27 @@ protected EndPoint findEndpointForImageStorage(DataStore store) { return RemoteHostEndPoint.getHypervisorHostEndPoint(host); } + @Override + public List findAllEndpointsForScope(DataStore store) { + Long dcId = null; + Scope storeScope = store.getScope(); + if (storeScope.getScopeType() == ScopeType.ZONE) { + dcId = storeScope.getScopeId(); + } + // find ssvm that can be used to download data to store. For zone-wide + // image store, use SSVM for that zone. For region-wide store, + // we can arbitrarily pick one ssvm to do that task + List ssAHosts = listUpAndConnectingSecondaryStorageVmHost(dcId); + if (ssAHosts == null || ssAHosts.isEmpty()) { + return null; + } + List endPoints = new ArrayList(); + for (HostVO host: ssAHosts) { + endPoints.add(RemoteHostEndPoint.getHypervisorHostEndPoint(host)); + } + return endPoints; + } + private List listUpAndConnectingSecondaryStorageVmHost(Long dcId) { QueryBuilder sc = QueryBuilder.create(HostVO.class); if (dcId != null) { @@ -333,7 +354,7 @@ public EndPoint select(DataStore store) { } } - private EndPoint getEndPointFromHostId(Long hostId) { + public EndPoint getEndPointFromHostId(Long hostId) { HostVO host = hostDao.findById(hostId); return RemoteHostEndPoint.getHypervisorHostEndPoint(host); } diff --git a/engine/storage/src/main/java/org/apache/cloudstack/storage/image/BaseImageStoreDriverImpl.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/image/BaseImageStoreDriverImpl.java index dec9b76dbc84..965c33228887 100644 --- a/engine/storage/src/main/java/org/apache/cloudstack/storage/image/BaseImageStoreDriverImpl.java +++ b/engine/storage/src/main/java/org/apache/cloudstack/storage/image/BaseImageStoreDriverImpl.java @@ -20,21 +20,18 @@ import java.net.URI; import java.net.URISyntaxException; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; import java.util.ArrayList; +import java.util.Collections; import java.util.Date; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; import javax.inject.Inject; -import com.cloud.agent.api.storage.OVFPropertyTO; -import com.cloud.storage.Upload; -import com.cloud.storage.dao.TemplateOVFPropertiesDao; -import com.cloud.storage.TemplateOVFPropertyVO; -import com.cloud.utils.crypt.DBEncryptionUtil; -import org.apache.commons.collections.CollectionUtils; -import org.apache.log4j.Logger; - import org.apache.cloudstack.engine.subsystem.api.storage.CopyCommandResult; import org.apache.cloudstack.engine.subsystem.api.storage.CreateCmdResult; import org.apache.cloudstack.engine.subsystem.api.storage.DataObject; @@ -47,24 +44,42 @@ import org.apache.cloudstack.framework.async.AsyncRpcContext; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.storage.command.CommandResult; +import org.apache.cloudstack.storage.command.CopyCommand; import org.apache.cloudstack.storage.command.DeleteCommand; import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao; import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO; import org.apache.cloudstack.storage.datastore.db.VolumeDataStoreDao; import org.apache.cloudstack.storage.datastore.db.VolumeDataStoreVO; import org.apache.cloudstack.storage.endpoint.DefaultEndPointSelector; +import org.apache.commons.collections.CollectionUtils; +import org.apache.log4j.Logger; +import com.cloud.agent.AgentManager; import com.cloud.agent.api.Answer; import com.cloud.agent.api.storage.CreateDatadiskTemplateCommand; import com.cloud.agent.api.storage.DownloadAnswer; import com.cloud.agent.api.storage.GetDatadisksAnswer; import com.cloud.agent.api.storage.GetDatadisksCommand; +import com.cloud.agent.api.storage.OVFPropertyTO; import com.cloud.agent.api.to.DataObjectType; import com.cloud.agent.api.to.DataTO; +import com.cloud.agent.api.to.DatadiskTO; +import com.cloud.agent.api.to.NfsTO; import com.cloud.alert.AlertManager; +import com.cloud.configuration.Config; +import com.cloud.exception.AgentUnavailableException; +import com.cloud.exception.OperationTimedoutException; +import com.cloud.host.dao.HostDao; +import com.cloud.secstorage.CommandExecLogDao; +import com.cloud.secstorage.CommandExecLogVO; +import com.cloud.storage.DataStoreRole; +import com.cloud.storage.StorageManager; +import com.cloud.storage.TemplateOVFPropertyVO; +import com.cloud.storage.Upload; import com.cloud.storage.VMTemplateStorageResourceAssoc; import com.cloud.storage.VMTemplateVO; import com.cloud.storage.VolumeVO; +import com.cloud.storage.dao.TemplateOVFPropertiesDao; import com.cloud.storage.dao.VMTemplateDao; import com.cloud.storage.dao.VMTemplateDetailsDao; import com.cloud.storage.dao.VMTemplateZoneDao; @@ -72,9 +87,12 @@ import com.cloud.storage.download.DownloadMonitor; import com.cloud.user.ResourceLimitService; import com.cloud.user.dao.AccountDao; -import com.cloud.agent.api.to.DatadiskTO; -import com.cloud.utils.net.Proxy; +import com.cloud.utils.NumbersUtil; +import com.cloud.utils.crypt.DBEncryptionUtil; +import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.exception.CloudRuntimeException; +import com.cloud.utils.net.Proxy; +import com.cloud.vm.dao.SecondaryStorageVmDao; public abstract class BaseImageStoreDriverImpl implements ImageStoreDriver { private static final Logger s_logger = Logger.getLogger(BaseImageStoreDriverImpl.class); @@ -106,6 +124,16 @@ public abstract class BaseImageStoreDriverImpl implements ImageStoreDriver { ResourceLimitService _resourceLimitMgr; @Inject TemplateOVFPropertiesDao templateOvfPropertiesDao; + @Inject + HostDao hostDao; + @Inject + CommandExecLogDao _cmdExecLogDao; + @Inject + StorageManager storageMgr; + @Inject + protected SecondaryStorageVmDao _secStorageVmDao; + @Inject + AgentManager agentMgr; protected String _proxy = null; @@ -333,10 +361,77 @@ public void deleteAsync(DataStore dataStore, DataObject data, AsyncCompletionCal @Override public void copyAsync(DataObject srcdata, DataObject destData, AsyncCompletionCallback callback) { + if (!canCopy(srcdata, destData)) { + return; + } + + if ((srcdata.getType() == DataObjectType.TEMPLATE && destData.getType() == DataObjectType.TEMPLATE) || + (srcdata.getType() == DataObjectType.SNAPSHOT && destData.getType() == DataObjectType.SNAPSHOT) || + (srcdata.getType() == DataObjectType.VOLUME && destData.getType() == DataObjectType.VOLUME)) { + + int nMaxExecutionMinutes = NumbersUtil.parseInt(configDao.getValue(Config.SecStorageCmdExecutionTimeMax.key()), 30); + CopyCommand cmd = new CopyCommand(srcdata.getTO(), destData.getTO(), nMaxExecutionMinutes * 60 * 1000, true); + Answer answer = null; + + // Select host endpoint such that the load is balanced out + List eps = _epSelector.findAllEndpointsForScope(srcdata.getDataStore()); + if (eps == null || eps.isEmpty()) { + String errMsg = "No remote endpoint to send command, check if host or ssvm is down?"; + s_logger.error(errMsg); + answer = new Answer(cmd, false, errMsg); + } else { + // select endpoint with least number of commands running on them + answer = sendToLeastBusyEndpoint(eps, cmd); + } + CopyCommandResult result = new CopyCommandResult("", answer); + callback.complete(result); + } + } + + private Answer sendToLeastBusyEndpoint(List eps, CopyCommand cmd) { + Answer answer = null; + EndPoint endPoint = null; + Long epId = ssvmWithLeastMigrateJobs(); + if (epId == null) { + Collections.shuffle(eps); + endPoint = eps.get(0); + } else { + List remainingEps = eps.stream().filter(ep -> ep.getId() != epId ).collect(Collectors.toList()); + if (!remainingEps.isEmpty()) { + Collections.shuffle(remainingEps); + endPoint = remainingEps.get(0); + } else { + endPoint = _defaultEpSelector.getEndPointFromHostId(epId); + } + } + CommandExecLogVO execLog = new CommandExecLogVO(endPoint.getId(), _secStorageVmDao.findByInstanceName(hostDao.findById(endPoint.getId()).getName()).getId(), "DataMigrationCommand", 1); + Long cmdExecId = _cmdExecLogDao.persist(execLog).getId(); + String errMsg = null; + try { + answer = agentMgr.send(endPoint.getId(), cmd); + answer.setContextParam("cmd", cmdExecId.toString()); + return answer; + } catch (AgentUnavailableException e) { + errMsg = e.toString(); + s_logger.debug("Failed to send command, due to Agent:" + endPoint.getId() + ", " + e.toString()); + } catch (OperationTimedoutException e) { + errMsg = e.toString(); + s_logger.debug("Failed to send command, due to Agent:" + endPoint.getId() + ", " + e.toString()); + } + throw new CloudRuntimeException("Failed to send command, due to Agent:" + endPoint.getId() + ", " + errMsg); } @Override public boolean canCopy(DataObject srcData, DataObject destData) { + DataStore srcStore = srcData.getDataStore(); + DataStore destStore = destData.getDataStore(); + if ((srcData.getDataStore().getTO() instanceof NfsTO && destData.getDataStore().getTO() instanceof NfsTO) && + (srcStore.getRole() == DataStoreRole.Image && destStore.getRole() == DataStoreRole.Image) && + ((srcData.getType() == DataObjectType.TEMPLATE && destData.getType() == DataObjectType.TEMPLATE) || + (srcData.getType() == DataObjectType.SNAPSHOT && destData.getType() == DataObjectType.SNAPSHOT) || + (srcData.getType() == DataObjectType.VOLUME && destData.getType() == DataObjectType.VOLUME))) { + return true; + } return false; } @@ -399,4 +494,28 @@ public Void createDataDiskTemplateAsync(TemplateInfo dataDiskTemplate, String pa callback.complete(result); return null; } + + private Integer getCopyCmdsCountToSpecificSSVM(Long ssvmId) { + return _cmdExecLogDao.getCopyCmdCountForSSVM(ssvmId); + } + + private Long ssvmWithLeastMigrateJobs() { + s_logger.debug("Picking ssvm from the pool with least commands running on it"); + String query = "select host_id, count(*) from cmd_exec_log group by host_id order by 2 limit 1;"; + TransactionLegacy txn = TransactionLegacy.currentTxn(); + + Long epId = null; + PreparedStatement pstmt = null; + try { + pstmt = txn.prepareAutoCloseStatement(query); + ResultSet rs = pstmt.executeQuery(); + if (rs.getFetchSize() > 0) { + rs.absolute(1); + epId = (long) rs.getInt(1); + } + } catch (SQLException e) { + s_logger.debug("SQLException caught", e); + } + return epId; + } } diff --git a/engine/storage/src/main/java/org/apache/cloudstack/storage/image/datastore/ImageStoreProviderManager.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/image/datastore/ImageStoreProviderManager.java index 01f2100f77f1..7e2f720042ed 100644 --- a/engine/storage/src/main/java/org/apache/cloudstack/storage/image/datastore/ImageStoreProviderManager.java +++ b/engine/storage/src/main/java/org/apache/cloudstack/storage/image/datastore/ImageStoreProviderManager.java @@ -36,6 +36,8 @@ public interface ImageStoreProviderManager { List listImageStoresByScope(ZoneScope scope); + List listImageStoresByScopeExcludingReadOnly(ZoneScope scope); + List listImageStoreByProvider(String provider); List listImageCacheStores(Scope scope); @@ -76,4 +78,6 @@ public interface ImageStoreProviderManager { * @return the list of DataStore which have free capacity */ List listImageStoresWithFreeCapacity(List imageStores); + + List orderImageStoresOnFreeCapacity(List imageStores); } diff --git a/engine/storage/src/main/java/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java index 151b9bae8bc3..4e5210d0b3bf 100644 --- a/engine/storage/src/main/java/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java +++ b/engine/storage/src/main/java/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java @@ -27,8 +27,6 @@ import javax.inject.Inject; import javax.naming.ConfigurationException; -import com.cloud.storage.DataStoreRole; -import com.cloud.storage.SnapshotVO; import org.apache.cloudstack.engine.subsystem.api.storage.DataObjectInStore; import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine; import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine.Event; @@ -39,6 +37,8 @@ import org.springframework.stereotype.Component; import com.cloud.hypervisor.Hypervisor; +import com.cloud.storage.DataStoreRole; +import com.cloud.storage.SnapshotVO; import com.cloud.storage.dao.SnapshotDao; import com.cloud.utils.db.DB; import com.cloud.utils.db.Filter; @@ -65,6 +65,7 @@ public class SnapshotDataStoreDaoImpl extends GenericDaoBase stateSearch; private SearchBuilder parentSnapshotSearch; private SearchBuilder snapshotVOSearch; + private SearchBuilder snapshotCreatedSearch; public static ArrayList hypervisorsSupportingSnapshotsChaining = new ArrayList(); @@ -158,6 +159,11 @@ public boolean configure(String name, Map params) throws Configu snapshotVOSearch.and("volume_id", snapshotVOSearch.entity().getVolumeId(), SearchCriteria.Op.EQ); snapshotVOSearch.done(); + snapshotCreatedSearch = createSearchBuilder(); + snapshotCreatedSearch.and("store_id", snapshotCreatedSearch.entity().getDataStoreId(), Op.EQ); + snapshotCreatedSearch.and("created", snapshotCreatedSearch.entity().getCreated(), Op.BETWEEN); + snapshotCreatedSearch.done(); + return true; } @@ -334,6 +340,15 @@ public SnapshotDataStoreVO findBySnapshot(long snapshotId, DataStoreRole role) { return findOneBy(sc); } + @Override + public SnapshotDataStoreVO findBySourceSnapshot(long snapshotId, DataStoreRole role) { + SearchCriteria sc = snapshotSearch.create(); + sc.setParameters("snapshot_id", snapshotId); + sc.setParameters("store_role", role); + sc.setParameters("state", State.Migrating); + return findOneBy(sc); + } + @Override public List listAllByVolumeAndDataStore(long volumeId, DataStoreRole role) { SearchCriteria sc = volumeSearch.create(); @@ -462,6 +477,15 @@ public List listByState(ObjectInDataStoreStateMachine.State } @Override + public List findSnapshots(Long storeId, Date start, Date end) { + SearchCriteria sc = snapshotCreatedSearch.create(); + sc.setParameters("store_id", storeId); + if (start != null && end != null) { + sc.setParameters("created", start, end); + } + return search(sc, null); + } + public SnapshotDataStoreVO findDestroyedReferenceBySnapshot(long snapshotId, DataStoreRole role) { SearchCriteria sc = snapshotSearch.create(); sc.setParameters("snapshot_id", snapshotId); diff --git a/engine/storage/src/main/java/org/apache/cloudstack/storage/image/db/TemplateDataStoreDaoImpl.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/image/db/TemplateDataStoreDaoImpl.java index 2372e8444cc5..5a0e4eeceede 100644 --- a/engine/storage/src/main/java/org/apache/cloudstack/storage/image/db/TemplateDataStoreDaoImpl.java +++ b/engine/storage/src/main/java/org/apache/cloudstack/storage/image/db/TemplateDataStoreDaoImpl.java @@ -97,6 +97,7 @@ public boolean configure(String name, Map params) throws Configu templateSearch = createSearchBuilder(); templateSearch.and("template_id", templateSearch.entity().getTemplateId(), SearchCriteria.Op.EQ); + templateSearch.and("download_state", templateSearch.entity().getDownloadState(), SearchCriteria.Op.NEQ); templateSearch.and("destroyed", templateSearch.entity().getDestroyed(), SearchCriteria.Op.EQ); templateSearch.done(); @@ -418,6 +419,15 @@ public List listByTemplate(long templateId) { return search(sc, null); } + @Override + public List listByTemplateNotBypassed(long templateId) { + SearchCriteria sc = templateSearch.create(); + sc.setParameters("template_id", templateId); + sc.setParameters("download_state", Status.BYPASSED); + sc.setParameters("destroyed", false); + return search(sc, null); + } + @Override public TemplateDataStoreVO findByTemplateZone(long templateId, Long zoneId, DataStoreRole role) { // get all elgible image stores diff --git a/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeObject.java b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeObject.java index 690a1124402d..76e59d828566 100644 --- a/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeObject.java +++ b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeObject.java @@ -20,9 +20,6 @@ import javax.inject.Inject; -import com.cloud.storage.MigrationOptions; -import org.apache.log4j.Logger; - import org.apache.cloudstack.engine.subsystem.api.storage.DataObjectInStore; import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine; @@ -33,6 +30,7 @@ import org.apache.cloudstack.storage.datastore.db.VolumeDataStoreDao; import org.apache.cloudstack.storage.datastore.db.VolumeDataStoreVO; import org.apache.cloudstack.storage.to.VolumeObjectTO; +import org.apache.log4j.Logger; import com.cloud.agent.api.Answer; import com.cloud.agent.api.storage.DownloadAnswer; @@ -42,6 +40,7 @@ import com.cloud.offering.DiskOffering.DiskCacheMode; import com.cloud.storage.DataStoreRole; import com.cloud.storage.DiskOfferingVO; +import com.cloud.storage.MigrationOptions; import com.cloud.storage.Storage.ImageFormat; import com.cloud.storage.Storage.ProvisioningType; import com.cloud.storage.Volume; @@ -392,7 +391,9 @@ public void processEvent(ObjectInDataStoreStateMachine.Event event) { if (event == ObjectInDataStoreStateMachine.Event.CreateOnlyRequested) { volEvent = Volume.Event.UploadRequested; } else if (event == ObjectInDataStoreStateMachine.Event.MigrationRequested) { - volEvent = Volume.Event.CopyRequested; + volEvent = Event.CopyRequested; + } else if (event == ObjectInDataStoreStateMachine.Event.MigrateDataRequested) { + return; } } else { if (event == ObjectInDataStoreStateMachine.Event.CreateRequested || event == ObjectInDataStoreStateMachine.Event.CreateOnlyRequested) { diff --git a/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/dao/AsyncJobDaoImpl.java b/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/dao/AsyncJobDaoImpl.java index 6ca698b7589a..7dd73435093d 100644 --- a/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/dao/AsyncJobDaoImpl.java +++ b/framework/jobs/src/main/java/org/apache/cloudstack/framework/jobs/dao/AsyncJobDaoImpl.java @@ -242,7 +242,9 @@ public long countPendingJobs(String havingInfo, String... cmds) { SearchCriteria sc = asyncJobTypeSearch.create(); sc.setParameters("status", JobInfo.Status.IN_PROGRESS); sc.setParameters("job_cmd", (Object[])cmds); - sc.setParameters("job_info", "%" + havingInfo + "%"); + if (havingInfo != null) { + sc.setParameters("job_info", "%" + havingInfo + "%"); + } List results = customSearch(sc, null); return results.get(0); } diff --git a/plugins/integrations/prometheus/src/main/java/org/apache/cloudstack/metrics/PrometheusExporterImpl.java b/plugins/integrations/prometheus/src/main/java/org/apache/cloudstack/metrics/PrometheusExporterImpl.java index 92c128b27fe1..7a1fb0c5af8a 100644 --- a/plugins/integrations/prometheus/src/main/java/org/apache/cloudstack/metrics/PrometheusExporterImpl.java +++ b/plugins/integrations/prometheus/src/main/java/org/apache/cloudstack/metrics/PrometheusExporterImpl.java @@ -220,7 +220,7 @@ private void addStorageMetrics(final List metricsList, final long dcId, fi metricsList.add(new ItemPool(zoneName, zoneUuid, poolName, poolPath, "primary", poolFactor, TOTAL, totalCapacity)); } - for (final ImageStore imageStore : imageStoreDao.findByScope(new ZoneScope(dcId))) { + for (final ImageStore imageStore : imageStoreDao.findByZone(new ZoneScope(dcId), null)) { final StorageStats stats = ApiDBUtils.getSecondaryStorageStatistics(imageStore.getId()); metricsList.add(new ItemPool(zoneName, zoneUuid, imageStore.getName(), imageStore.getUrl(), "secondary", null, USED, stats != null ? stats.getByteUsed() : 0)); metricsList.add(new ItemPool(zoneName, zoneUuid, imageStore.getName(), imageStore.getUrl(), "secondary", null, TOTAL, stats != null ? stats.getCapacityBytes() : 0)); diff --git a/pom.xml b/pom.xml index 262960cad8fa..c040d9667251 100644 --- a/pom.xml +++ b/pom.xml @@ -98,6 +98,7 @@ 0.5 2.6 2.7.0 + 3.6.1 diff --git a/server/pom.xml b/server/pom.xml index 7cd0dd1460d3..e3d98dff6108 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -89,6 +89,11 @@ commons-codec commons-codec + + org.apache.commons + commons-math3 + ${cs.commons-math3.version} + org.apache.cloudstack cloud-utils diff --git a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java index f13b7953e336..154a29308597 100644 --- a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java @@ -118,6 +118,7 @@ import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.query.QueryService; import org.apache.cloudstack.resourcedetail.dao.DiskOfferingDetailsDao; +import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao; import org.apache.commons.collections.CollectionUtils; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -413,11 +414,15 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q @Inject private RouterHealthCheckResultDao routerHealthCheckResultDao; + @Inject + private TemplateDataStoreDao templateDataStoreDao; + @Inject private ProjectInvitationDao projectInvitationDao; @Inject private UserDao userDao; + /* * (non-Javadoc) * @@ -2531,6 +2536,7 @@ private Pair, Integer> searchForImageStoresInternal(ListI Object keyword = cmd.getKeyword(); Long startIndex = cmd.getStartIndex(); Long pageSize = cmd.getPageSizeVal(); + Boolean readonly = cmd.getReadonly(); Filter searchFilter = new Filter(ImageStoreJoinVO.class, "id", Boolean.TRUE, startIndex, pageSize); @@ -2543,6 +2549,7 @@ private Pair, Integer> searchForImageStoresInternal(ListI sb.and("protocol", sb.entity().getProtocol(), SearchCriteria.Op.EQ); sb.and("provider", sb.entity().getProviderName(), SearchCriteria.Op.EQ); sb.and("role", sb.entity().getRole(), SearchCriteria.Op.EQ); + sb.and("readonly", sb.entity().isReadonly(), Op.EQ); SearchCriteria sc = sb.create(); sc.setParameters("role", DataStoreRole.Image); @@ -2571,7 +2578,9 @@ private Pair, Integer> searchForImageStoresInternal(ListI if (protocol != null) { sc.setParameters("protocol", protocol); } - + if (readonly != null) { + sc.setParameters("readonly", readonly); + } // search Store details by ids Pair, Integer> uniqueStorePair = _imageStoreJoinDao.searchAndCount(sc, searchFilter); Integer count = uniqueStorePair.second(); diff --git a/server/src/main/java/com/cloud/api/query/dao/ImageStoreJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/ImageStoreJoinDaoImpl.java index 2389b57cf4fe..b91398de9b41 100644 --- a/server/src/main/java/com/cloud/api/query/dao/ImageStoreJoinDaoImpl.java +++ b/server/src/main/java/com/cloud/api/query/dao/ImageStoreJoinDaoImpl.java @@ -67,6 +67,7 @@ public ImageStoreResponse newImageStoreResponse(ImageStoreJoinVO ids) { osResponse.setName(ids.getName()); osResponse.setProviderName(ids.getProviderName()); osResponse.setProtocol(ids.getProtocol()); + osResponse.setReadonly(ids.isReadonly()); String url = ids.getUrl(); //if store is type cifs, remove the password if(ids.getProtocol().equals("cifs".toString())) { diff --git a/server/src/main/java/com/cloud/api/query/dao/TemplateJoinDaoImpl.java b/server/src/main/java/com/cloud/api/query/dao/TemplateJoinDaoImpl.java index 61a101743c91..398a63d6383f 100644 --- a/server/src/main/java/com/cloud/api/query/dao/TemplateJoinDaoImpl.java +++ b/server/src/main/java/com/cloud/api/query/dao/TemplateJoinDaoImpl.java @@ -25,10 +25,6 @@ import javax.inject.Inject; -import org.apache.cloudstack.utils.security.DigestHelper; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; - import org.apache.cloudstack.api.ResponseObject.ResponseView; import org.apache.cloudstack.api.response.ChildTemplateResponse; import org.apache.cloudstack.api.response.TemplateResponse; @@ -36,6 +32,12 @@ import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine; import org.apache.cloudstack.engine.subsystem.api.storage.TemplateState; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; +import org.apache.cloudstack.storage.datastore.db.ImageStoreDao; +import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao; +import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO; +import org.apache.cloudstack.utils.security.DigestHelper; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.api.ApiDBUtils; import com.cloud.api.ApiResponseHelper; @@ -70,6 +72,10 @@ public class TemplateJoinDaoImpl extends GenericDaoBaseWithTagInformation tmpltIdPairSearch; @@ -108,6 +114,7 @@ protected TemplateJoinDaoImpl() { activeTmpltSearch.and("store_id", activeTmpltSearch.entity().getDataStoreId(), SearchCriteria.Op.EQ); activeTmpltSearch.and("type", activeTmpltSearch.entity().getTemplateType(), SearchCriteria.Op.EQ); activeTmpltSearch.and("templateState", activeTmpltSearch.entity().getTemplateState(), SearchCriteria.Op.EQ); + activeTmpltSearch.and("public", activeTmpltSearch.entity().isPublicTemplate(), SearchCriteria.Op.EQ); activeTmpltSearch.done(); // select distinct pair (template_id, zone_id) @@ -141,7 +148,18 @@ private String getTemplateStatus(TemplateJoinVO template) { @Override public TemplateResponse newTemplateResponse(ResponseView view, TemplateJoinVO template) { + List templatesInStore = _templateStoreDao.listByTemplateNotBypassed(template.getId()); + List> downloadProgressDetails = new ArrayList(); + HashMap downloadDetailInImageStores = null; + for (TemplateDataStoreVO templateInStore : templatesInStore) { + downloadDetailInImageStores = new HashMap<>(); + downloadDetailInImageStores.put("datastore", dataStoreDao.findById(templateInStore.getDataStoreId()).getName()); + downloadDetailInImageStores.put("downloadPercent", Integer.toString(templateInStore.getDownloadPercent())); + downloadDetailInImageStores.put("downloadState", (templateInStore.getDownloadState() != null ? templateInStore.getDownloadState().toString() : "")); + downloadProgressDetails.add(downloadDetailInImageStores); + } TemplateResponse templateResponse = new TemplateResponse(); + templateResponse.setDownloadProgress(downloadProgressDetails); templateResponse.setId(template.getUuid()); templateResponse.setName(template.getName()); templateResponse.setDisplayText(template.getDisplayText()); @@ -478,6 +496,7 @@ public List listActiveTemplates(long storeId) { sc.setParameters("store_id", storeId); sc.setParameters("type", TemplateType.USER); sc.setParameters("templateState", VirtualMachineTemplate.State.Active); + sc.setParameters("public", Boolean.FALSE); return searchIncludingRemoved(sc, null, null, false); } diff --git a/server/src/main/java/com/cloud/api/query/vo/ImageStoreJoinVO.java b/server/src/main/java/com/cloud/api/query/vo/ImageStoreJoinVO.java index 244f89ec3c2b..bcc73cb47bf5 100644 --- a/server/src/main/java/com/cloud/api/query/vo/ImageStoreJoinVO.java +++ b/server/src/main/java/com/cloud/api/query/vo/ImageStoreJoinVO.java @@ -67,6 +67,9 @@ public class ImageStoreJoinVO extends BaseViewVO implements InternalIdentity, Id @Enumerated(value = EnumType.STRING) private DataStoreRole role; + @Column(name = "readonly") + private boolean readonly = false; + @Column(name = "data_center_id") private long zoneId; @@ -128,4 +131,8 @@ public DataStoreRole getRole() { public Date getRemoved() { return removed; } + + public boolean isReadonly() { + return readonly; + } } diff --git a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java index 7e9c9d39c2b1..f95cc6556dd9 100755 --- a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java @@ -1708,7 +1708,7 @@ protected void checkIfZoneIsDeletable(final long zoneId) { } //check if there are any secondary stores attached to the zone - if(!_imageStoreDao.findByScope(new ZoneScope(zoneId)).isEmpty()) { + if(!_imageStoreDao.findByZone(new ZoneScope(zoneId), null).isEmpty()) { throw new CloudRuntimeException(errorMsg + "there are Secondary storages in this zone"); } diff --git a/server/src/main/java/com/cloud/server/ManagementServerImpl.java b/server/src/main/java/com/cloud/server/ManagementServerImpl.java index 32fd5b44b551..80b54c09dfa2 100644 --- a/server/src/main/java/com/cloud/server/ManagementServerImpl.java +++ b/server/src/main/java/com/cloud/server/ManagementServerImpl.java @@ -195,8 +195,10 @@ import org.apache.cloudstack.api.command.admin.storage.ListStoragePoolsCmd; import org.apache.cloudstack.api.command.admin.storage.ListStorageProvidersCmd; import org.apache.cloudstack.api.command.admin.storage.ListStorageTagsCmd; +import org.apache.cloudstack.api.command.admin.storage.MigrateSecondaryStorageDataCmd; import org.apache.cloudstack.api.command.admin.storage.PreparePrimaryStorageForMaintenanceCmd; import org.apache.cloudstack.api.command.admin.storage.UpdateCloudToUseObjectStoreCmd; +import org.apache.cloudstack.api.command.admin.storage.UpdateImageStoreCmd; import org.apache.cloudstack.api.command.admin.storage.UpdateStoragePoolCmd; import org.apache.cloudstack.api.command.admin.swift.AddSwiftCmd; import org.apache.cloudstack.api.command.admin.swift.ListSwiftsCmd; @@ -2765,6 +2767,7 @@ public List> getCommands() { cmdList.add(FindStoragePoolsForMigrationCmd.class); cmdList.add(PreparePrimaryStorageForMaintenanceCmd.class); cmdList.add(UpdateStoragePoolCmd.class); + cmdList.add(UpdateImageStoreCmd.class); cmdList.add(DestroySystemVmCmd.class); cmdList.add(ListSystemVMsCmd.class); cmdList.add(MigrateSystemVMCmd.class); @@ -3158,6 +3161,7 @@ public List> getCommands() { cmdList.add(ListTemplateOVFProperties.class); cmdList.add(GetRouterHealthCheckResultsCmd.class); cmdList.add(StartRollingMaintenanceCmd.class); + cmdList.add(MigrateSecondaryStorageDataCmd.class); // Out-of-band management APIs for admins cmdList.add(EnableOutOfBandManagementForHostCmd.class); diff --git a/server/src/main/java/com/cloud/storage/ImageStoreServiceImpl.java b/server/src/main/java/com/cloud/storage/ImageStoreServiceImpl.java new file mode 100644 index 000000000000..43f9cd455be2 --- /dev/null +++ b/server/src/main/java/com/cloud/storage/ImageStoreServiceImpl.java @@ -0,0 +1,163 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package com.cloud.storage; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import javax.inject.Inject; +import javax.naming.ConfigurationException; + +import org.apache.cloudstack.api.command.admin.storage.MigrateSecondaryStorageDataCmd; +import org.apache.cloudstack.api.response.MigrationResponse; +import org.apache.cloudstack.context.CallContext; +import org.apache.cloudstack.engine.orchestration.service.StorageOrchestrationService; +import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreProvider; +import org.apache.cloudstack.framework.config.ConfigKey; +import org.apache.cloudstack.framework.jobs.AsyncJobManager; +import org.apache.cloudstack.storage.ImageStoreService; +import org.apache.cloudstack.storage.datastore.db.ImageStoreDao; +import org.apache.cloudstack.storage.datastore.db.ImageStoreVO; +import org.apache.commons.lang3.EnumUtils; +import org.apache.log4j.Logger; + +import com.cloud.event.ActionEvent; +import com.cloud.event.EventTypes; +import com.cloud.exception.InvalidParameterValueException; +import com.cloud.utils.component.ManagerBase; +import com.cloud.utils.exception.CloudRuntimeException; + +public class ImageStoreServiceImpl extends ManagerBase implements ImageStoreService { + + private static final Logger s_logger = Logger.getLogger(ImageStoreServiceImpl.class); + @Inject + ImageStoreDao imageStoreDao; + @Inject + private AsyncJobManager jobMgr; + @Inject + private StorageOrchestrationService stgService; + + ConfigKey ImageStoreImbalanceThreshold = new ConfigKey<>("Advanced", Double.class, + "image.store.imbalance.threshold", + "0.3", + "The storage imbalance threshold that is compared with the standard deviation percentage for a storage utilization metric. " + + "The value is a percentage in decimal format.", + true, ConfigKey.Scope.Global); + + + public Integer numConcurrentCopyTasksPerSSVM = null; + + + + @Override + public boolean configure(String name, Map params) throws ConfigurationException { + return true; + } + + @Override + @ActionEvent(eventType = EventTypes.EVENT_IMAGE_STORE_DATA_MIGRATE, eventDescription = "migrating Image store data", async = true) + public MigrationResponse migrateData(MigrateSecondaryStorageDataCmd cmd) { + Long srcImgStoreId = cmd.getId(); + ImageStoreVO srcImageVO = imageStoreDao.findById(srcImgStoreId); + List destImgStoreIds = cmd.getMigrateTo(); + List imagestores = new ArrayList(); + String migrationType = cmd.getMigrationType(); + + // default policy is complete + MigrationPolicy policy = MigrationPolicy.COMPLETE; + + if (migrationType != null) { + if (!EnumUtils.isValidEnum(MigrationPolicy.class, migrationType.toUpperCase())) { + throw new CloudRuntimeException("Not a valid migration policy"); + } + policy = MigrationPolicy.valueOf(migrationType.toUpperCase()); + } + + String message = null; + + if (srcImageVO == null) { + throw new CloudRuntimeException("Cannot find secondary storage with id: " + srcImgStoreId); + } + + Long srcStoreDcId = srcImageVO.getDataCenterId(); + imagestores.add(srcImageVO.getName()); + if (srcImageVO.getRole() != DataStoreRole.Image) { + throw new CloudRuntimeException("Secondary storage is not of Image Role"); + } + + if (!srcImageVO.getProviderName().equals(DataStoreProvider.NFS_IMAGE)) { + throw new InvalidParameterValueException("Migration of datastore objects is supported only for NFS based image stores"); + } + + if (destImgStoreIds.contains(srcImgStoreId)) { + s_logger.debug("One of the destination stores is the same as the source image store ... Ignoring it..."); + destImgStoreIds.remove(srcImgStoreId); + } + + // Validate all the Ids correspond to valid Image stores + List destDatastores = new ArrayList<>(); + for (Long id : destImgStoreIds) { + ImageStoreVO store = imageStoreDao.findById(id); + if (store == null) { + s_logger.warn("Secondary storage with id: " + id + "is not found. Skipping it..."); + continue; + } + if (store.isReadonly()) { + s_logger.warn("Secondary storage: "+ id + " cannot be considered for migration as has read-only permission, Skipping it... "); + continue; + } + + if (!store.getProviderName().equals(DataStoreProvider.NFS_IMAGE)) { + s_logger.warn("Destination image store : " + store.getName() + " not NFS based. Store not suitable for migration!"); + continue; + } + + if (srcStoreDcId != null && store.getDataCenterId() != null && !srcStoreDcId.equals(store.getDataCenterId())) { + s_logger.warn("Source and destination stores are not in the same zone. Skipping destination store: " + store.getName()); + continue; + } + + destDatastores.add(id); + imagestores.add(store.getName()); + } + + if (destDatastores.size() < 1) { + throw new CloudRuntimeException("No destination valid store(s) available to migrate. Could" + + "be due to invalid store ID(s) or store(s) are read-only. Terminating Migration of data"); + } + + if (isMigrateJobRunning()){ + message = "A migrate job is in progress, please try again later..."; + return new MigrationResponse(message, policy.toString(), false); + } + + CallContext.current().setEventDetails("Migrating files/data objects " + "from : " + imagestores.get(0) + " to: " + imagestores.subList(1, imagestores.size())); + return stgService.migrateData(srcImgStoreId, destDatastores, policy); + } + + + // Ensures that only one migrate job may occur at a time, in order to reduce load + private boolean isMigrateJobRunning() { + long count = jobMgr.countPendingJobs(null, MigrateSecondaryStorageDataCmd.class.getName()); + if (count > 1) { + return true; + } + return false; + } +} diff --git a/server/src/main/java/com/cloud/storage/StorageManagerImpl.java b/server/src/main/java/com/cloud/storage/StorageManagerImpl.java index f327b6aebf06..c59a26d3bc66 100644 --- a/server/src/main/java/com/cloud/storage/StorageManagerImpl.java +++ b/server/src/main/java/com/cloud/storage/StorageManagerImpl.java @@ -1368,7 +1368,7 @@ public void cleanupSecondaryStorage(boolean recurring) { // so here we don't need to issue DeleteCommand to resource anymore, only need to remove db entry. try { // Cleanup templates in template_store_ref - List imageStores = _dataStoreMgr.getImageStoresByScope(new ZoneScope(null)); + List imageStores = _dataStoreMgr.getImageStoresByScopeExcludingReadOnly(new ZoneScope(null)); for (DataStore store : imageStores) { try { long storeId = store.getId(); @@ -2157,6 +2157,18 @@ public ImageStore migrateToObjectStore(String name, String url, String providerN return discoverImageStore(name, url, providerName, null, details); } + @Override + public ImageStore updateImageStoreStatus(Long id, Boolean readonly) { + // Input validation + ImageStoreVO imageStoreVO = _imageStoreDao.findById(id); + if (imageStoreVO == null) { + throw new IllegalArgumentException("Unable to find image store with ID: " + id); + } + imageStoreVO.setReadonly(readonly); + _imageStoreDao.update(id, imageStoreVO); + return imageStoreVO; + } + private void duplicateCacheStoreRecordsToRegionStore(long storeId) { _templateStoreDao.duplicateCacheRecordsOnRegionStore(storeId); _snapshotStoreDao.duplicateCacheRecordsOnRegionStore(storeId); @@ -2511,7 +2523,9 @@ public ConfigKey[] getConfigKeys() { KvmStorageOnlineMigrationWait, KvmAutoConvergence, MaxNumberOfManagedClusteredFileSystems, - PRIMARY_STORAGE_DOWNLOAD_WAIT + PRIMARY_STORAGE_DOWNLOAD_WAIT, + SecStorageMaxMigrateSessions, + MaxDataMigrationWaitTime }; } diff --git a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java index dc90c37d2a73..b5c33eb5fa11 100644 --- a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java +++ b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java @@ -2788,24 +2788,26 @@ private String orchestrateExtractVolume(long volumeId, long zoneId) { // Copy volume from primary to secondary storage VolumeInfo srcVol = volFactory.getVolume(volumeId); - AsyncCallFuture cvAnswer = volService.copyVolume(srcVol, secStore); - // Check if you got a valid answer. + VolumeInfo destVol = volFactory.getVolume(volumeId, DataStoreRole.Image); VolumeApiResult cvResult = null; - try { - cvResult = cvAnswer.get(); - } catch (InterruptedException e1) { - s_logger.debug("failed copy volume", e1); - throw new CloudRuntimeException("Failed to copy volume", e1); - } catch (ExecutionException e1) { - s_logger.debug("failed copy volume", e1); - throw new CloudRuntimeException("Failed to copy volume", e1); - } - if (cvResult == null || cvResult.isFailed()) { - String errorString = "Failed to copy the volume from the source primary storage pool to secondary storage."; - throw new CloudRuntimeException(errorString); + if (destVol == null) { + AsyncCallFuture cvAnswer = volService.copyVolume(srcVol, secStore); + // Check if you got a valid answer. + try { + cvResult = cvAnswer.get(); + } catch (InterruptedException e1) { + s_logger.debug("failed copy volume", e1); + throw new CloudRuntimeException("Failed to copy volume", e1); + } catch (ExecutionException e1) { + s_logger.debug("failed copy volume", e1); + throw new CloudRuntimeException("Failed to copy volume", e1); + } + if (cvResult == null || cvResult.isFailed()) { + String errorString = "Failed to copy the volume from the source primary storage pool to secondary storage."; + throw new CloudRuntimeException(errorString); + } } - - VolumeInfo vol = cvResult.getVolume(); + VolumeInfo vol = cvResult != null ? cvResult.getVolume() : destVol; String extractUrl = secStore.createEntityExtractUrl(vol.getPath(), vol.getFormat(), vol); VolumeDataStoreVO volumeStoreRef = _volumeStoreDao.findByVolume(volumeId); diff --git a/server/src/main/java/com/cloud/storage/download/DownloadListener.java b/server/src/main/java/com/cloud/storage/download/DownloadListener.java index 51f9d42980cc..25dffb3e8afa 100644 --- a/server/src/main/java/com/cloud/storage/download/DownloadListener.java +++ b/server/src/main/java/com/cloud/storage/download/DownloadListener.java @@ -297,7 +297,7 @@ else if ( cmd instanceof StartupStorageCommand) { }*/ else if (cmd instanceof StartupSecondaryStorageCommand) { try{ - List imageStores = _storeMgr.getImageStoresByScope(new ZoneScope(agent.getDataCenterId())); + List imageStores = _storeMgr.getImageStoresByScopeExcludingReadOnly(new ZoneScope(agent.getDataCenterId())); for (DataStore store : imageStores) { _volumeSrv.handleVolumeSync(store); _imageSrv.handleTemplateSync(store); diff --git a/server/src/main/java/com/cloud/storage/secondary/SecondaryStorageVmManager.java b/server/src/main/java/com/cloud/storage/secondary/SecondaryStorageVmManager.java index 5c50d46f4dda..b57b44303209 100644 --- a/server/src/main/java/com/cloud/storage/secondary/SecondaryStorageVmManager.java +++ b/server/src/main/java/com/cloud/storage/secondary/SecondaryStorageVmManager.java @@ -23,6 +23,7 @@ import com.cloud.host.HostVO; import com.cloud.utils.Pair; import com.cloud.utils.component.Manager; +import com.cloud.vm.SecondaryStorageVm; import com.cloud.vm.SecondaryStorageVmVO; public interface SecondaryStorageVmManager extends Manager { @@ -31,6 +32,7 @@ public interface SecondaryStorageVmManager extends Manager { public static final int DEFAULT_SS_VM_CPUMHZ = 500; // 500 MHz public static final int DEFAULT_SS_VM_MTUSIZE = 1500; public static final int DEFAULT_SS_VM_CAPACITY = 50; // max command execution session per SSVM + public static final int DEFAULT_MIGRATE_SS_VM_CAPACITY = 2; // number of concurrent migrate operations to happen per SSVM public static final int DEFAULT_STANDBY_CAPACITY = 10; // standy capacity to reserve per zone public static final String ALERT_SUBJECT = "secondarystoragevm-alert"; @@ -56,4 +58,6 @@ public interface SecondaryStorageVmManager extends Manager { public List listUpAndConnectingSecondaryStorageVmHost(Long dcId); public HostVO pickSsvmHost(HostVO ssHost); + + void allocCapacity(long dataCenterId, SecondaryStorageVm.Role role); } diff --git a/server/src/main/java/com/cloud/template/HypervisorTemplateAdapter.java b/server/src/main/java/com/cloud/template/HypervisorTemplateAdapter.java index 85c4a77774e8..80ca46912f24 100644 --- a/server/src/main/java/com/cloud/template/HypervisorTemplateAdapter.java +++ b/server/src/main/java/com/cloud/template/HypervisorTemplateAdapter.java @@ -16,10 +16,6 @@ // under the License. package com.cloud.template; -import com.cloud.agent.api.Answer; -import com.cloud.host.HostVO; -import com.cloud.hypervisor.Hypervisor; -import com.cloud.resource.ResourceManager; import java.util.Collections; import java.util.HashSet; import java.util.LinkedList; @@ -29,26 +25,18 @@ import javax.inject.Inject; -import com.cloud.configuration.Config; -import com.cloud.utils.db.Transaction; -import com.cloud.utils.db.TransactionCallback; -import com.cloud.utils.db.TransactionStatus; import org.apache.cloudstack.agent.directdownload.CheckUrlAnswer; import org.apache.cloudstack.agent.directdownload.CheckUrlCommand; -import org.apache.cloudstack.api.command.user.iso.GetUploadParamsForIsoCmd; -import org.apache.cloudstack.api.command.user.template.GetUploadParamsForTemplateCmd; -import org.apache.cloudstack.engine.subsystem.api.storage.DataObject; -import org.apache.cloudstack.engine.subsystem.api.storage.EndPoint; -import org.apache.cloudstack.storage.command.TemplateOrVolumePostUploadCommand; -import org.apache.cloudstack.utils.security.DigestHelper; -import org.apache.log4j.Logger; -import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao; import org.apache.cloudstack.api.command.user.iso.DeleteIsoCmd; +import org.apache.cloudstack.api.command.user.iso.GetUploadParamsForIsoCmd; import org.apache.cloudstack.api.command.user.iso.RegisterIsoCmd; import org.apache.cloudstack.api.command.user.template.DeleteTemplateCmd; +import org.apache.cloudstack.api.command.user.template.GetUploadParamsForTemplateCmd; import org.apache.cloudstack.api.command.user.template.RegisterTemplateCmd; +import org.apache.cloudstack.engine.subsystem.api.storage.DataObject; import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; +import org.apache.cloudstack.engine.subsystem.api.storage.EndPoint; import org.apache.cloudstack.engine.subsystem.api.storage.EndPointSelector; import org.apache.cloudstack.engine.subsystem.api.storage.Scope; import org.apache.cloudstack.engine.subsystem.api.storage.TemplateDataFactory; @@ -62,11 +50,17 @@ import org.apache.cloudstack.framework.async.AsyncRpcContext; import org.apache.cloudstack.framework.messagebus.MessageBus; import org.apache.cloudstack.framework.messagebus.PublishScope; +import org.apache.cloudstack.storage.command.TemplateOrVolumePostUploadCommand; +import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao; import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO; import org.apache.cloudstack.storage.image.datastore.ImageStoreEntity; +import org.apache.cloudstack.utils.security.DigestHelper; +import org.apache.log4j.Logger; import com.cloud.agent.AgentManager; +import com.cloud.agent.api.Answer; import com.cloud.alert.AlertManager; +import com.cloud.configuration.Config; import com.cloud.configuration.Resource.ResourceType; import com.cloud.dc.DataCenterVO; import com.cloud.dc.dao.DataCenterDao; @@ -74,11 +68,11 @@ import com.cloud.event.UsageEventUtils; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.ResourceAllocationException; +import com.cloud.host.HostVO; +import com.cloud.hypervisor.Hypervisor; import com.cloud.org.Grouping; +import com.cloud.resource.ResourceManager; import com.cloud.server.StatsCollector; -import com.cloud.template.VirtualMachineTemplate.State; -import com.cloud.user.Account; -import com.cloud.utils.Pair; import com.cloud.storage.ScopeType; import com.cloud.storage.Storage.ImageFormat; import com.cloud.storage.Storage.TemplateType; @@ -89,9 +83,15 @@ import com.cloud.storage.dao.VMTemplateDao; import com.cloud.storage.dao.VMTemplateZoneDao; import com.cloud.storage.download.DownloadMonitor; +import com.cloud.template.VirtualMachineTemplate.State; +import com.cloud.user.Account; +import com.cloud.utils.Pair; import com.cloud.utils.UriUtils; import com.cloud.utils.db.DB; import com.cloud.utils.db.EntityManager; +import com.cloud.utils.db.Transaction; +import com.cloud.utils.db.TransactionCallback; +import com.cloud.utils.db.TransactionStatus; import com.cloud.utils.exception.CloudRuntimeException; public class HypervisorTemplateAdapter extends TemplateAdapterBase { @@ -241,14 +241,12 @@ public VMTemplateVO create(TemplateProfile profile) { private void createTemplateWithinZone(Long zId, TemplateProfile profile, VMTemplateVO template) { // find all eligible image stores for this zone scope - List imageStores = storeMgr.getImageStoresByScope(new ZoneScope(zId)); + List imageStores = storeMgr.getImageStoresByScopeExcludingReadOnly(new ZoneScope(zId)); if (imageStores == null || imageStores.size() == 0) { throw new CloudRuntimeException("Unable to find image store to download template " + profile.getTemplate()); } Set zoneSet = new HashSet(); - Collections.shuffle(imageStores); - // For private templates choose a random store. TODO - Have a better algorithm based on size, no. of objects, load etc. for (DataStore imageStore : imageStores) { // skip data stores for a disabled zone Long zoneId = imageStore.getScope().getScopeId(); @@ -308,7 +306,7 @@ public List doInTransaction(TransactionStatus zoneId = profile.getZoneIdList().get(0); // find all eligible image stores for this zone scope - List imageStores = storeMgr.getImageStoresByScope(new ZoneScope(zoneId)); + List imageStores = storeMgr.getImageStoresByScopeExcludingReadOnly(new ZoneScope(zoneId)); if (imageStores == null || imageStores.size() == 0) { throw new CloudRuntimeException("Unable to find image store to download template " + profile.getTemplate()); } diff --git a/server/src/main/java/com/cloud/template/TemplateManagerImpl.java b/server/src/main/java/com/cloud/template/TemplateManagerImpl.java index 749f272bf361..86eabe44ce20 100755 --- a/server/src/main/java/com/cloud/template/TemplateManagerImpl.java +++ b/server/src/main/java/com/cloud/template/TemplateManagerImpl.java @@ -754,7 +754,7 @@ public boolean copy(long userId, VMTemplateVO template, DataStore srcSecStore, D long tmpltId = template.getId(); long dstZoneId = dstZone.getId(); // find all eligible image stores for the destination zone - List dstSecStores = _dataStoreMgr.getImageStoresByScope(new ZoneScope(dstZoneId)); + List dstSecStores = _dataStoreMgr.getImageStoresByScopeExcludingReadOnly(new ZoneScope(dstZoneId)); if (dstSecStores == null || dstSecStores.isEmpty()) { throw new StorageUnavailableException("Destination zone is not ready, no image store associated", DataCenter.class, dstZone.getId()); } diff --git a/server/src/main/java/org/apache/cloudstack/diagnostics/DiagnosticsServiceImpl.java b/server/src/main/java/org/apache/cloudstack/diagnostics/DiagnosticsServiceImpl.java index 49ad2159698f..0184a44ff390 100644 --- a/server/src/main/java/org/apache/cloudstack/diagnostics/DiagnosticsServiceImpl.java +++ b/server/src/main/java/org/apache/cloudstack/diagnostics/DiagnosticsServiceImpl.java @@ -372,7 +372,7 @@ private VMInstanceVO getSecondaryStorageVmInZone(Long zoneId) { * @return a valid secondary storage with less than DiskQuotaPercentageThreshold set by global config */ private DataStore getImageStore(Long zoneId) { - List stores = storeMgr.getImageStoresByScope(new ZoneScope(zoneId)); + List stores = storeMgr.getImageStoresByScopeExcludingReadOnly(new ZoneScope(zoneId)); if (CollectionUtils.isEmpty(stores)) { throw new CloudRuntimeException("No Secondary storage found in Zone with Id: " + zoneId); } diff --git a/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml b/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml index 91522f3a5009..672f7c0d4144 100644 --- a/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml +++ b/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-managers-context.xml @@ -262,6 +262,8 @@ + + ()); Mockito.when(_volumeDao.findByDc(anyLong())).thenReturn(new ArrayList()); Mockito.when(_physicalNetworkDao.listByZone(anyLong())).thenReturn(new ArrayList()); - Mockito.when(_imageStoreDao.findByScope(any(ZoneScope.class))).thenReturn(new ArrayList()); + Mockito.when(_imageStoreDao.findByZone(any(ZoneScope.class), anyBoolean())).thenReturn(new ArrayList()); configurationMgr.checkIfZoneIsDeletable(new Random().nextLong()); } @@ -712,7 +712,7 @@ public void checkIfZoneIsDeletableFailureOnHostTest() { Mockito.when(_vmInstanceDao.listByZoneId(anyLong())).thenReturn(new ArrayList()); Mockito.when(_volumeDao.findByDc(anyLong())).thenReturn(new ArrayList()); Mockito.when(_physicalNetworkDao.listByZone(anyLong())).thenReturn(new ArrayList()); - Mockito.when(_imageStoreDao.findByScope(any(ZoneScope.class))).thenReturn(new ArrayList()); + Mockito.when(_imageStoreDao.findByZone(any(ZoneScope.class), anyBoolean())).thenReturn(new ArrayList()); configurationMgr.checkIfZoneIsDeletable(new Random().nextLong()); } @@ -730,7 +730,7 @@ public void checkIfZoneIsDeletableFailureOnPodTest() { Mockito.when(_vmInstanceDao.listByZoneId(anyLong())).thenReturn(new ArrayList()); Mockito.when(_volumeDao.findByDc(anyLong())).thenReturn(new ArrayList()); Mockito.when(_physicalNetworkDao.listByZone(anyLong())).thenReturn(new ArrayList()); - Mockito.when(_imageStoreDao.findByScope(any(ZoneScope.class))).thenReturn(new ArrayList()); + Mockito.when(_imageStoreDao.findByZone(any(ZoneScope.class), anyBoolean())).thenReturn(new ArrayList()); configurationMgr.checkIfZoneIsDeletable(new Random().nextLong()); } @@ -744,7 +744,7 @@ public void checkIfZoneIsDeletableFailureOnPrivateIpAddressTest() { Mockito.when(_vmInstanceDao.listByZoneId(anyLong())).thenReturn(new ArrayList()); Mockito.when(_volumeDao.findByDc(anyLong())).thenReturn(new ArrayList()); Mockito.when(_physicalNetworkDao.listByZone(anyLong())).thenReturn(new ArrayList()); - Mockito.when(_imageStoreDao.findByScope(any(ZoneScope.class))).thenReturn(new ArrayList()); + Mockito.when(_imageStoreDao.findByZone(any(ZoneScope.class), anyBoolean())).thenReturn(new ArrayList()); configurationMgr.checkIfZoneIsDeletable(new Random().nextLong()); } @@ -758,7 +758,7 @@ public void checkIfZoneIsDeletableFailureOnPublicIpAddressTest() { Mockito.when(_vmInstanceDao.listByZoneId(anyLong())).thenReturn(new ArrayList()); Mockito.when(_volumeDao.findByDc(anyLong())).thenReturn(new ArrayList()); Mockito.when(_physicalNetworkDao.listByZone(anyLong())).thenReturn(new ArrayList()); - Mockito.when(_imageStoreDao.findByScope(any(ZoneScope.class))).thenReturn(new ArrayList()); + Mockito.when(_imageStoreDao.findByZone(any(ZoneScope.class), anyBoolean())).thenReturn(new ArrayList()); configurationMgr.checkIfZoneIsDeletable(new Random().nextLong()); } @@ -776,7 +776,7 @@ public void checkIfZoneIsDeletableFailureOnVmInstanceTest() { Mockito.when(_vmInstanceDao.listByZoneId(anyLong())).thenReturn(arrayList); Mockito.when(_volumeDao.findByDc(anyLong())).thenReturn(new ArrayList()); Mockito.when(_physicalNetworkDao.listByZone(anyLong())).thenReturn(new ArrayList()); - Mockito.when(_imageStoreDao.findByScope(any(ZoneScope.class))).thenReturn(new ArrayList()); + Mockito.when(_imageStoreDao.findByZone(any(ZoneScope.class), anyBoolean())).thenReturn(new ArrayList()); configurationMgr.checkIfZoneIsDeletable(new Random().nextLong()); } @@ -794,7 +794,7 @@ public void checkIfZoneIsDeletableFailureOnVolumeTest() { Mockito.when(_vmInstanceDao.listByZoneId(anyLong())).thenReturn(new ArrayList()); Mockito.when(_volumeDao.findByDc(anyLong())).thenReturn(arrayList); Mockito.when(_physicalNetworkDao.listByZone(anyLong())).thenReturn(new ArrayList()); - Mockito.when(_imageStoreDao.findByScope(any(ZoneScope.class))).thenReturn(new ArrayList()); + Mockito.when(_imageStoreDao.findByZone(any(ZoneScope.class), anyBoolean())).thenReturn(new ArrayList()); configurationMgr.checkIfZoneIsDeletable(new Random().nextLong()); } @@ -812,7 +812,7 @@ public void checkIfZoneIsDeletableFailureOnPhysicalNetworkTest() { Mockito.when(_vmInstanceDao.listByZoneId(anyLong())).thenReturn(new ArrayList()); Mockito.when(_volumeDao.findByDc(anyLong())).thenReturn(new ArrayList()); Mockito.when(_physicalNetworkDao.listByZone(anyLong())).thenReturn(arrayList); - Mockito.when(_imageStoreDao.findByScope(any(ZoneScope.class))).thenReturn(new ArrayList()); + Mockito.when(_imageStoreDao.findByZone(any(ZoneScope.class), anyBoolean())).thenReturn(new ArrayList()); configurationMgr.checkIfZoneIsDeletable(new Random().nextLong()); } diff --git a/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/PremiumSecondaryStorageManagerImpl.java b/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/PremiumSecondaryStorageManagerImpl.java index ecfc67eaff6d..d21ec614f405 100644 --- a/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/PremiumSecondaryStorageManagerImpl.java +++ b/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/PremiumSecondaryStorageManagerImpl.java @@ -16,6 +16,8 @@ // under the License. package org.apache.cloudstack.secondarystorage; +import java.util.ArrayList; +import java.util.Collections; import java.util.Date; import java.util.List; import java.util.Map; @@ -27,16 +29,19 @@ import com.cloud.agent.api.Command; import com.cloud.configuration.Config; +import com.cloud.host.Host; import com.cloud.host.HostVO; import com.cloud.host.Status; import com.cloud.host.dao.HostDao; import com.cloud.resource.ResourceManager; import com.cloud.secstorage.CommandExecLogDao; import com.cloud.secstorage.CommandExecLogVO; +import com.cloud.storage.StorageManager; import com.cloud.storage.secondary.SecondaryStorageVmManager; import com.cloud.utils.DateUtil; import com.cloud.utils.NumbersUtil; import com.cloud.utils.Pair; +import com.cloud.utils.db.Filter; import com.cloud.utils.db.JoinBuilder.JoinType; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; @@ -51,8 +56,13 @@ public class PremiumSecondaryStorageManagerImpl extends SecondaryStorageManagerI private static final Logger s_logger = Logger.getLogger(PremiumSecondaryStorageManagerImpl.class); private int _capacityPerSSVM = SecondaryStorageVmManager.DEFAULT_SS_VM_CAPACITY; + private int migrateCapPerSSVM = DEFAULT_MIGRATE_SS_VM_CAPACITY; private int _standbyCapacity = SecondaryStorageVmManager.DEFAULT_STANDBY_CAPACITY; private int _maxExecutionTimeMs = 1800000; + private int maxDataMigrationWaitTime = 900000; + long currentTime = DateUtil.currentGMTTime().getTime(); + long nextSpawnTime = currentTime + maxDataMigrationWaitTime; + private List migrationSSVMS = new ArrayList<>(); @Inject SecondaryStorageVmDao _secStorageVmDao; @@ -63,6 +73,7 @@ public class PremiumSecondaryStorageManagerImpl extends SecondaryStorageManagerI @Inject ResourceManager _resourceMgr; protected SearchBuilder activeCommandSearch; + protected SearchBuilder activeCopyCommandSearch; protected SearchBuilder hostSearch; @Override @@ -75,16 +86,27 @@ public boolean configure(String name, Map params) throws Configu int nMaxExecutionMinutes = NumbersUtil.parseInt(_configDao.getValue(Config.SecStorageCmdExecutionTimeMax.key()), 30); _maxExecutionTimeMs = nMaxExecutionMinutes * 60 * 1000; + migrateCapPerSSVM = StorageManager.SecStorageMaxMigrateSessions.value(); + int nMaxDataMigrationWaitTime = StorageManager.MaxDataMigrationWaitTime.value(); + maxDataMigrationWaitTime = nMaxDataMigrationWaitTime * 60 * 1000; + nextSpawnTime = currentTime + maxDataMigrationWaitTime; + hostSearch = _hostDao.createSearchBuilder(); hostSearch.and("dc", hostSearch.entity().getDataCenterId(), Op.EQ); hostSearch.and("status", hostSearch.entity().getStatus(), Op.EQ); activeCommandSearch = _cmdExecLogDao.createSearchBuilder(); activeCommandSearch.and("created", activeCommandSearch.entity().getCreated(), Op.GTEQ); - activeCommandSearch.join("hostSearch", hostSearch, activeCommandSearch.entity().getInstanceId(), hostSearch.entity().getId(), JoinType.INNER); + activeCommandSearch.join("hostSearch", hostSearch, activeCommandSearch.entity().getHostId(), hostSearch.entity().getId(), JoinType.INNER); + + activeCopyCommandSearch = _cmdExecLogDao.createSearchBuilder(); + activeCopyCommandSearch.and("created", activeCopyCommandSearch.entity().getCreated(), Op.GTEQ); + activeCopyCommandSearch.and("command_name", activeCopyCommandSearch.entity().getCommandName(), Op.EQ); + activeCopyCommandSearch.join("hostSearch", hostSearch, activeCopyCommandSearch.entity().getHostId(), hostSearch.entity().getId(), JoinType.INNER); hostSearch.done(); activeCommandSearch.done(); + activeCopyCommandSearch.done(); return true; } @@ -96,7 +118,6 @@ public Pair scanPool(Long pool) { } Date cutTime = new Date(DateUtil.currentGMTTime().getTime() - _maxExecutionTimeMs); - _cmdExecLogDao.expungeExpiredRecords(cutTime); boolean suspendAutoLoading = !reserveStandbyCapacity(); @@ -134,19 +155,54 @@ public Pair scanPool(Long pool) { return new Pair(AfterScanAction.nop, null); } - alreadyRunning = _secStorageVmDao.getSecStorageVmListInStates(null, dataCenterId, State.Running, State.Migrating, State.Starting); + alreadyRunning = _secStorageVmDao.getSecStorageVmListInStates(null, dataCenterId, State.Running, State.Migrating, State.Starting); List activeCmds = findActiveCommands(dataCenterId, cutTime); - if (alreadyRunning.size() * _capacityPerSSVM - activeCmds.size() < _standbyCapacity) { - s_logger.info("secondary storage command execution standby capactiy low (running VMs: " + alreadyRunning.size() + ", active cmds: " + activeCmds.size() + - "), starting a new one"); - return new Pair(AfterScanAction.expand, SecondaryStorageVm.Role.commandExecutor); - } + List copyCmdsInPipeline = findAllActiveCopyCommands(dataCenterId, cutTime); + return scaleSSVMOnLoad(alreadyRunning, activeCmds, copyCmdsInPipeline, dataCenterId); + } + return new Pair(AfterScanAction.nop, null); + } + + private Pair scaleSSVMOnLoad(List alreadyRunning, List activeCmds, + List copyCmdsInPipeline, long dataCenterId) { + Integer hostsCount = _hostDao.countAllByTypeInZone(dataCenterId, Host.Type.Routing); + Integer maxSsvms = (hostsCount < MaxNumberOfSsvmsForMigration.value()) ? hostsCount : MaxNumberOfSsvmsForMigration.value(); + int halfLimit = Math.round((float) (alreadyRunning.size() * migrateCapPerSSVM) / 2); + currentTime = DateUtil.currentGMTTime().getTime(); + if (alreadyRunning.size() * _capacityPerSSVM - activeCmds.size() < _standbyCapacity) { + s_logger.info("secondary storage command execution standby capactiy low (running VMs: " + alreadyRunning.size() + ", active cmds: " + activeCmds.size() + + "), starting a new one"); + return new Pair(AfterScanAction.expand, SecondaryStorageVm.Role.commandExecutor); + } + else if (!copyCmdsInPipeline.isEmpty() && copyCmdsInPipeline.size() >= halfLimit && + ((Math.abs(currentTime - copyCmdsInPipeline.get(halfLimit - 1).getCreated().getTime()) > maxDataMigrationWaitTime )) && + (currentTime > nextSpawnTime) && alreadyRunning.size() <= maxSsvms) { + nextSpawnTime = currentTime + maxDataMigrationWaitTime; + s_logger.debug("scaling SSVM to handle migration tasks"); + return new Pair(AfterScanAction.expand, SecondaryStorageVm.Role.commandExecutor); + } + scaleDownSSVMOnLoad(alreadyRunning, activeCmds, copyCmdsInPipeline); return new Pair(AfterScanAction.nop, null); } + private void scaleDownSSVMOnLoad(List alreadyRunning, List activeCmds, + List copyCmdsInPipeline) { + int halfLimit = Math.round((float) (alreadyRunning.size() * migrateCapPerSSVM) / 2); + if ((copyCmdsInPipeline.size() < halfLimit && alreadyRunning.size() * _capacityPerSSVM - activeCmds.size() > (_standbyCapacity + 5)) && alreadyRunning.size() > 1) { + Collections.reverse(alreadyRunning); + for(SecondaryStorageVmVO vm : alreadyRunning) { + long count = activeCmds.stream().filter(cmd -> cmd.getInstanceId() == vm.getId()).count(); + if (count == 0 && copyCmdsInPipeline.size() == 0 && vm.getRole() != SecondaryStorageVm.Role.templateProcessor) { + destroySecStorageVm(vm.getId()); + break; + } + } + } + } + @Override public Pair assignSecStorageVm(long zoneId, Command cmd) { @@ -159,26 +215,33 @@ public Pair assignSecStorageVm(long zoneId, Comman if (host != null && host.getStatus() == Status.Up) return new Pair(host, secStorageVm); } - return null; } private List findActiveCommands(long dcId, Date cutTime) { SearchCriteria sc = activeCommandSearch.create(); - sc.setParameters("created", cutTime); sc.setJoinParameters("hostSearch", "dc", dcId); sc.setJoinParameters("hostSearch", "status", Status.Up); - + List result = _cmdExecLogDao.search(sc, null); return _cmdExecLogDao.search(sc, null); } + private List findAllActiveCopyCommands(long dcId, Date cutTime) { + SearchCriteria sc = activeCopyCommandSearch.create(); + sc.setParameters("created", cutTime); + sc.setParameters("command_name", "DataMigrationCommand"); + sc.setJoinParameters("hostSearch", "dc", dcId); + sc.setJoinParameters("hostSearch", "status", Status.Up); + Filter filter = new Filter(CommandExecLogVO.class, "created", true, null, null); + return _cmdExecLogDao.search(sc, filter); + } + private boolean reserveStandbyCapacity() { String value = _configDao.getValue(Config.SystemVMAutoReserveCapacity.key()); if (value != null && value.equalsIgnoreCase("true")) { return true; } - return false; } } diff --git a/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java b/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java index efa43cb022af..5ee60eb7e039 100644 --- a/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java +++ b/services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java @@ -266,6 +266,9 @@ public class SecondaryStorageManagerImpl extends ManagerBase implements Secondar static final ConfigKey NTPServerConfig = new ConfigKey(String.class, "ntp.server.list", "Advanced", null, "Comma separated list of NTP servers to configure in Secondary storage VM", false, ConfigKey.Scope.Global, null); + static final ConfigKey MaxNumberOfSsvmsForMigration = new ConfigKey("Advanced", Integer.class, "max.ssvm.count", "5", + "Number of additional SSVMs to handle migration of data objects concurrently", true, ConfigKey.Scope.Global); + public SecondaryStorageManagerImpl() { } @@ -720,7 +723,7 @@ public SecondaryStorageVmVO assignSecStorageVmFromStoppedPool(long dataCenterId, return null; } - private void allocCapacity(long dataCenterId, SecondaryStorageVm.Role role) { + public void allocCapacity(long dataCenterId, SecondaryStorageVm.Role role) { if (s_logger.isTraceEnabled()) { s_logger.trace("Allocate secondary storage vm standby capacity for data center : " + dataCenterId); } @@ -822,7 +825,7 @@ public boolean isZoneReady(Map zoneHostInfoMap, long dataCen return false; } - List stores = _dataStoreMgr.getImageStoresByScope(new ZoneScope(dataCenterId)); + List stores = _dataStoreMgr.getImageStoresByScopeExcludingReadOnly(new ZoneScope(dataCenterId)); if (stores.size() < 1) { s_logger.debug("No image store added in zone " + dataCenterId + ", wait until it is ready to launch secondary storage vm"); return false; @@ -1374,7 +1377,7 @@ public Pair scanPool(Long pool) { _secStorageVmDao.getSecStorageVmListInStates(SecondaryStorageVm.Role.templateProcessor, dataCenterId, State.Running, State.Migrating, State.Starting, State.Stopped, State.Stopping); int vmSize = (ssVms == null) ? 0 : ssVms.size(); - List ssStores = _dataStoreMgr.getImageStoresByScope(new ZoneScope(dataCenterId)); + List ssStores = _dataStoreMgr.getImageStoresByScopeExcludingReadOnly(new ZoneScope(dataCenterId)); int storeSize = (ssStores == null) ? 0 : ssStores.size(); if (storeSize > vmSize) { s_logger.info("No secondary storage vms found in datacenter id=" + dataCenterId + ", starting a new one"); @@ -1516,7 +1519,7 @@ public String getConfigComponentName() { @Override public ConfigKey[] getConfigKeys() { - return new ConfigKey[] {NTPServerConfig}; + return new ConfigKey[] {NTPServerConfig, MaxNumberOfSsvmsForMigration}; } } diff --git a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java index 7e25296db801..0832ab6e496b 100644 --- a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java +++ b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java @@ -54,6 +54,7 @@ import javax.naming.ConfigurationException; import org.apache.cloudstack.framework.security.keystore.KeystoreManager; +import org.apache.cloudstack.storage.NfsMountManagerImpl.PathParser; import org.apache.cloudstack.storage.command.CopyCmdAnswer; import org.apache.cloudstack.storage.command.CopyCommand; import org.apache.cloudstack.storage.command.DeleteCommand; @@ -67,7 +68,6 @@ import org.apache.cloudstack.storage.configdrive.ConfigDriveBuilder; import org.apache.cloudstack.storage.template.DownloadManager; import org.apache.cloudstack.storage.template.DownloadManagerImpl; -import org.apache.cloudstack.storage.NfsMountManagerImpl.PathParser; import org.apache.cloudstack.storage.template.UploadEntity; import org.apache.cloudstack.storage.template.UploadManager; import org.apache.cloudstack.storage.template.UploadManagerImpl; @@ -1050,6 +1050,10 @@ protected Answer execute(CopyCommand cmd) { DataStoreTO srcDataStore = srcData.getDataStore(); DataStoreTO destDataStore = destData.getDataStore(); + if (DataStoreRole.Image == srcDataStore.getRole() && DataStoreRole.Image == destDataStore.getRole()) { + return copyFromNfsToNfs(cmd); + } + if (srcData.getObjectType() == DataObjectType.SNAPSHOT && destData.getObjectType() == DataObjectType.TEMPLATE) { return createTemplateFromSnapshot(cmd); } @@ -1254,7 +1258,6 @@ protected long getVirtualSize(File file, ImageFormat format) { } protected File findFile(String path) { - File srcFile = _storage.getFile(path); if (!srcFile.exists()) { srcFile = _storage.getFile(path + ".qcow2"); @@ -1275,6 +1278,87 @@ protected File findFile(String path) { return srcFile; } + protected Answer copyFromNfsToNfs(CopyCommand cmd) { + final DataTO srcData = cmd.getSrcTO(); + final DataTO destData = cmd.getDestTO(); + DataStoreTO srcDataStore = srcData.getDataStore(); + NfsTO srcStore = (NfsTO)srcDataStore; + DataStoreTO destDataStore = destData.getDataStore(); + final NfsTO destStore = (NfsTO) destDataStore; + try { + File srcFile = new File(getDir(srcStore.getUrl(), _nfsVersion), srcData.getPath()); + File destFile = new File(getDir(destStore.getUrl(), _nfsVersion), destData.getPath()); + ImageFormat format = getTemplateFormat(srcFile.getName()); + + if (srcFile == null) { + return new CopyCmdAnswer("Can't find src file:" + srcFile); + } + if (srcData instanceof TemplateObjectTO || srcData instanceof VolumeObjectTO) { + File srcDir = null; + if (srcFile.isFile() || srcFile.getName().contains(".")) { + srcDir = new File(srcFile.getParent()); + } + File destDir = null; + if (destFile.isFile()) { + destDir = new File(destFile.getParent()); + } + try { + FileUtils.copyDirectory((srcDir == null ? srcFile : srcDir), (destDir == null? destFile : destDir)); + } catch (IOException e) { + String msg = "Failed to copy file to destination"; + s_logger.info(msg); + return new CopyCmdAnswer(msg); + } + } else { + destFile = new File(destFile, srcFile.getName()); + try { + if (srcFile.isFile()) { + FileUtils.copyFile(srcFile, destFile); + } else { + // for vmware + srcFile = new File(srcFile.getParent()); + FileUtils.copyDirectory(srcFile, destFile); + } + } catch (IOException e) { + String msg = "Failed to copy file to destination"; + s_logger.info(msg); + return new CopyCmdAnswer(msg); + } + } + + DataTO retObj = null; + if (destData.getObjectType() == DataObjectType.TEMPLATE) { + TemplateObjectTO newTemplate = new TemplateObjectTO(); + newTemplate.setPath(destData.getPath() + File.separator + srcFile.getName()); + newTemplate.setSize(getVirtualSize(srcFile, format)); + newTemplate.setPhysicalSize(srcFile.length()); + newTemplate.setFormat(format); + retObj = newTemplate; + } else if (destData.getObjectType() == DataObjectType.VOLUME) { + VolumeObjectTO newVol = new VolumeObjectTO(); + if (srcFile.isFile()) { + newVol.setPath(destData.getPath() + File.separator + srcFile.getName()); + } else { + newVol.setPath(destData.getPath()); + } + newVol.setSize(getVirtualSize(srcFile, format)); + retObj = newVol; + } else if (destData.getObjectType() == DataObjectType.SNAPSHOT) { + SnapshotObjectTO newSnapshot = new SnapshotObjectTO(); + if (srcFile.isFile()) { + newSnapshot.setPath(destData.getPath() + File.separator + destFile.getName()); + } else { + newSnapshot.setPath(destData.getPath() + File.separator + destFile.getName() + File.separator + destFile.getName()); + } + retObj = newSnapshot; + } + return new CopyCmdAnswer(retObj); + } catch (Exception e) { + s_logger.error("failed to copy file" + srcData.getPath(), e); + return new CopyCmdAnswer("failed to copy file" + srcData.getPath() + e.toString()); + } + } + protected Answer copyFromNfsToS3(CopyCommand cmd) { final DataTO srcData = cmd.getSrcTO(); final DataTO destData = cmd.getDestTO(); @@ -2433,6 +2517,18 @@ protected Answer deleteVolume(final DeleteCommand cmd) { } + private String getDir(String secUrl, String nfsVersion) { + try { + URI uri = new URI(secUrl); + String dir = mountUri(uri, nfsVersion); + return _parent + "/" + dir; + } catch (Exception e) { + String msg = "GetRootDir for " + secUrl + " failed due to " + e.toString(); + s_logger.error(msg, e); + throw new CloudRuntimeException(msg); + } + } + @Override synchronized public String getRootDir(String secUrl, String nfsVersion) { if (!_inSystemVM) { diff --git a/test/integration/smoke/test_secondary_storage.py b/test/integration/smoke/test_secondary_storage.py index b80b3e6813db..baa0f98935ed 100644 --- a/test/integration/smoke/test_secondary_storage.py +++ b/test/integration/smoke/test_secondary_storage.py @@ -24,6 +24,8 @@ from marvin.lib.base import * from marvin.lib.common import * from nose.plugins.attrib import attr +from marvin.cloudstackAPI import (listImageStores) +from marvin.cloudstackAPI import (updateImageStore) #Import System modules import time @@ -224,3 +226,174 @@ def test_02_sys_template_ready(self): True, "Builtin template is not ready %s in zone %s"%(template.status, zid) ) + + @attr(tags = ["advanced", "advancedns", "smoke", "basic", "eip", "sg"], required_hardware="false") + def test_03_check_read_only_flag(self): + """Test the secondary storage read-only flag + """ + + # Validate the following + # It is possible to enable/disable the read-only flag on a secondary storage and filter by it + # 1. Make the first secondary storage as read-only and verify its state has been changed + # 2. Search for the read-only storages and make sure ours is in the list + # 3. Make it again read/write and verify it has been set properly + + first_storage = self.list_secondary_storages(self.apiclient)[0] + first_storage_id = first_storage['id'] + # Step 1 + self.update_secondary_storage(self.apiclient, first_storage_id, True) + updated_storage = self.list_secondary_storages(self.apiclient, first_storage_id)[0] + self.assertEqual( + updated_storage['readonly'], + True, + "Check if the secondary storage status has been set to read-only" + ) + + # Step 2 + readonly_storages = self.list_secondary_storages(self.apiclient, readonly=True) + self.assertEqual( + isinstance(readonly_storages, list), + True, + "Check list response returns a valid list" + ) + result = any(d['id'] == first_storage_id for d in readonly_storages) + self.assertEqual( + result, + True, + "Check if we are able to list storages by their read-only status" + ) + + # Step 3 + self.update_secondary_storage(self.apiclient, first_storage_id, False) + updated_storage = self.list_secondary_storages(self.apiclient, first_storage_id)[0] + self.assertEqual( + updated_storage['readonly'], + False, + "Check if the secondary storage status has been set back to read-write" + ) + + @attr(tags = ["advanced", "advancedns", "smoke", "basic", "eip", "sg"], required_hardware="false") + def test_04_migrate_to_read_only_storage(self): + """Test migrations to a read-only secondary storage + """ + + # Validate the following + # It is not possible to migrate a storage to a read-only one + # NOTE: This test requires more than one secondary storage in the system + # 1. Make the first storage read-only + # 2. Try complete migration from the second to the first storage - it should fail + # 3. Try balanced migration from the second to the first storage - it should fail + # 4. Make the first storage read-write again + + storages = self.list_secondary_storages(self.apiclient) + if (len(storages)) < 2: + self.skipTest( + "This test requires more than one secondary storage") + + first_storage = self.list_secondary_storages(self.apiclient)[0] + first_storage_id = first_storage['id'] + second_storage = self.list_secondary_storages(self.apiclient)[1] + second_storage_id = second_storage['id'] + + # Set the first storage to read-only + self.update_secondary_storage(self.apiclient, first_storage_id, True) + + # Try complete migration from second to the first storage + + + success = False + try: + self.migrate_secondary_storage(self.apiclient, second_storage_id, first_storage_id, "complete") + except Exception as ex: + if re.search("No destination valid store\(s\) available to migrate.", str(ex)): + success = True + else: + self.debug("Secondary storage complete migration to a read-only one\ + did not fail appropriately. Error was actually : " + str(ex)); + + self.assertEqual(success, True, "Check if a complete migration to a read-only storage one fails appropriately") + + # Try balanced migration from second to the first storage + success = False + try: + self.migrate_secondary_storage(self.apiclient, second_storage_id, first_storage_id, "balance") + except Exception as ex: + if re.search("No destination valid store\(s\) available to migrate.", str(ex)): + success = True + else: + self.debug("Secondary storage balanced migration to a read-only one\ + did not fail appropriately. Error was actually : " + str(ex)) + + self.assertEqual(success, True, "Check if a balanced migration to a read-only storage one fails appropriately") + + # Set the first storage back to read-write + self.update_secondary_storage(self.apiclient, first_storage_id, False) + + @attr(tags = ["advanced", "advancedns", "smoke", "basic", "eip", "sg"], required_hardware="false") + def test_05_migrate_to_less_free_space(self): + """Test migrations when the destination storage has less space + """ + + # Validate the following + # Migration to a secondary storage with less space should be refused + # NOTE: This test requires more than one secondary storage in the system + # 1. Try complete migration from a storage with more (or equal) free space - migration should be refused + + storages = self.list_secondary_storages(self.apiclient) + if (len(storages)) < 2: + self.skipTest( + "This test requires more than one secondary storage") + + first_storage = self.list_secondary_storages(self.apiclient)[0] + first_storage_disksizeused = first_storage['disksizeused'] + first_storage_disksizetotal = first_storage['disksizetotal'] + second_storage = self.list_secondary_storages(self.apiclient)[1] + second_storage_disksizeused = second_storage['disksizeused'] + second_storage_disksizetotal = second_storage['disksizetotal'] + + first_storage_freespace = first_storage_disksizetotal - first_storage_disksizeused + second_storage_freespace = second_storage_disksizetotal - second_storage_disksizeused + + if first_storage_freespace == second_storage_freespace: + self.skipTest( + "This test requires two secondary storages with different free space") + + # Setting the storage with more free space as source storage + if first_storage_freespace > second_storage_freespace: + src_storage = first_storage['id'] + dst_storage = second_storage['id'] + else: + src_storage = second_storage['id'] + dst_storage = first_storage['id'] + + response = self.migrate_secondary_storage(self.apiclient, src_storage, dst_storage, "complete") + + success = False + if re.search("has equal or more free space than destination", str(response)): + success = True + else: + self.debug("Secondary storage complete migration to a storage \ + with less space was not refused. Here is the command output : " + str(response)) + + self.assertEqual(success, True, "Secondary storage complete migration to a storage\ + with less space was properly refused.") + + def list_secondary_storages(self, apiclient, id=None, readonly=None): + cmd = listImageStores.listImageStoresCmd() + cmd.id = id + cmd.readonly = readonly + return apiclient.listImageStores(cmd) + + def update_secondary_storage(self, apiclient, id, readonly): + cmd = updateImageStore.updateImageStoreCmd() + cmd.id = id + cmd.readonly = readonly + apiclient.updateImageStore(cmd) + + def migrate_secondary_storage(self, apiclient, first_id, second_id, type): + cmd = migrateSecondaryStorageData.migrateSecondaryStorageDataCmd() + cmd.srcpool = first_id + cmd.destpools = second_id + cmd.migrationtype = type + response = apiclient.migrateSecondaryStorageData(cmd) + return response diff --git a/test/integration/smoke/test_templates.py b/test/integration/smoke/test_templates.py index 9e9dd9fd3d60..ae34f7628f4b 100644 --- a/test/integration/smoke/test_templates.py +++ b/test/integration/smoke/test_templates.py @@ -961,6 +961,40 @@ def test_08_list_system_templates(self): ) return + @attr(tags = ["advanced", "advancedns", "smoke", "basic", "sg"], required_hardware="false") + def test_09_list_templates_download_details(self): + """Test if list templates returns download details""" + + # Validate the following + # 1. ListTemplates API has been extended to support viewing the download details - progress, download states and datastore + + list_template_response = Template.list( + self.apiclient, + templatefilter='all', + account=self.user.name, + domainid=self.user.domainid + ) + self.assertEqual( + isinstance(list_template_response, list), + True, + "Check list response returns a valid list" + ) + + self.assertNotEqual( + len(list_template_response), + 0, + "Check template available in List Templates" + ) + + for template in list_template_response: + self.assertNotEqual( + len(template.downloaddetails), + 0, + "Not all templates have download details" + ) + + return + class TestCopyAndDeleteTemplatesAcrossZones(cloudstackTestCase): @classmethod diff --git a/tools/apidoc/gen_toc.py b/tools/apidoc/gen_toc.py index ef98b1358987..ca1c44fcd829 100644 --- a/tools/apidoc/gen_toc.py +++ b/tools/apidoc/gen_toc.py @@ -155,6 +155,7 @@ 'createSecondaryStagingStore': 'Image Store', 'deleteSecondaryStagingStore': 'Image Store', 'listSecondaryStagingStores': 'Image Store', + 'updateImageStore': 'Image Store', 'InternalLoadBalancer': 'Internal LB', 'DeploymentPlanners': 'Configuration', 'ObjectStore': 'Image Store', From 44bc1341621e8774615cc238e7953ce0bbc6e8e9 Mon Sep 17 00:00:00 2001 From: davidjumani Date: Thu, 17 Sep 2020 10:13:14 +0530 Subject: [PATCH 012/261] Adding acl name to several responses (#4315) --- .../api/response/NetworkACLItemResponse.java | 8 +++++++ .../api/response/NetworkResponse.java | 24 +++++++++---------- .../api/response/PrivateGatewayResponse.java | 8 +++++++ .../java/com/cloud/api/ApiResponseHelper.java | 2 ++ 4 files changed, 30 insertions(+), 12 deletions(-) diff --git a/api/src/main/java/org/apache/cloudstack/api/response/NetworkACLItemResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/NetworkACLItemResponse.java index 09f78243facb..f63cbbf4cb51 100644 --- a/api/src/main/java/org/apache/cloudstack/api/response/NetworkACLItemResponse.java +++ b/api/src/main/java/org/apache/cloudstack/api/response/NetworkACLItemResponse.java @@ -73,6 +73,10 @@ public class NetworkACLItemResponse extends BaseResponse { @Param(description = "the ID of the ACL this item belongs to") private String aclId; + @SerializedName(ApiConstants.ACL_NAME) + @Param(description = "the name of the ACL this item belongs to") + private String aclName; + @SerializedName(ApiConstants.NUMBER) @Param(description = "Number of the ACL Item") private Integer number; @@ -133,6 +137,10 @@ public void setAclId(String aclId) { this.aclId = aclId; } + public void setAclName(String aclName) { + this.aclName = aclName; + } + public void setNumber(Integer number) { this.number = number; } diff --git a/api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java index 4079ab31e662..1b6821248a39 100644 --- a/api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java +++ b/api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java @@ -222,6 +222,10 @@ public class NetworkResponse extends BaseResponse implements ControlledEntityRes @Param(description = "ACL Id associated with the VPC network") private String aclId; + @SerializedName(ApiConstants.ACL_NAME) + @Param(description = "ACL name associated with the VPC network") + private String aclName; + @SerializedName(ApiConstants.STRECHED_L2_SUBNET) @Param(description = "true if network can span multiple zones", since = "4.4") private Boolean strechedL2Subnet; @@ -238,10 +242,6 @@ public class NetworkResponse extends BaseResponse implements ControlledEntityRes @Param(description = "If the network has redundant routers enabled", since = "4.11.1") private Boolean redundantRouter; - @SerializedName(ApiConstants.ACL_NAME) - @Param(description = "ACL name associated with the VPC network", since = "4.15.0") - private String aclName; - public Boolean getDisplayNetwork() { return displayNetwork; } @@ -443,6 +443,14 @@ public void setAclId(String aclId) { this.aclId = aclId; } + public String getAclName() { + return aclName; + } + + public void setAclName(String aclName) { + this.aclName = aclName; + } + public void setStrechedL2Subnet(Boolean strechedL2Subnet) { this.strechedL2Subnet = strechedL2Subnet; } @@ -462,12 +470,4 @@ public Boolean getRedundantRouter() { public void setRedundantRouter(Boolean redundantRouter) { this.redundantRouter = redundantRouter; } - - public String getAclName() { - return aclName; - } - - public void setAclName(String aclName) { - this.aclName = aclName; - } } diff --git a/api/src/main/java/org/apache/cloudstack/api/response/PrivateGatewayResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/PrivateGatewayResponse.java index be2faa796d6a..381c7d163999 100644 --- a/api/src/main/java/org/apache/cloudstack/api/response/PrivateGatewayResponse.java +++ b/api/src/main/java/org/apache/cloudstack/api/response/PrivateGatewayResponse.java @@ -101,6 +101,10 @@ public class PrivateGatewayResponse extends BaseResponse implements ControlledEn @Param(description = "ACL Id set for private gateway") private String aclId; + @SerializedName(ApiConstants.ACL_NAME) + @Param(description = "ACL name set for private gateway") + private String aclName; + @Override public String getObjectId() { return this.id; @@ -183,4 +187,8 @@ public void setAclId(String aclId) { this.aclId = aclId; } + public void setAclName(String aclName) { + this.aclName = aclName; + } + } diff --git a/server/src/main/java/com/cloud/api/ApiResponseHelper.java b/server/src/main/java/com/cloud/api/ApiResponseHelper.java index 201ea1c4eff1..2957a59b07ec 100644 --- a/server/src/main/java/com/cloud/api/ApiResponseHelper.java +++ b/server/src/main/java/com/cloud/api/ApiResponseHelper.java @@ -2409,6 +2409,7 @@ public NetworkACLItemResponse createNetworkACLItemResponse(NetworkACLItem aclIte NetworkACL acl = ApiDBUtils.findByNetworkACLId(aclItem.getAclId()); if (acl != null) { response.setAclId(acl.getUuid()); + response.setAclName(acl.getName()); } //set tag information @@ -3003,6 +3004,7 @@ public PrivateGatewayResponse createPrivateGatewayResponse(PrivateGateway result NetworkACL acl = ApiDBUtils.findByNetworkACLId(result.getNetworkACLId()); if (acl != null) { response.setAclId(acl.getUuid()); + response.setAclName(acl.getName()); } response.setObjectName("privategateway"); From 6ee6633e6d377d7a7539dea0fca3f974626a9f94 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Thu, 17 Sep 2020 10:15:11 +0530 Subject: [PATCH 013/261] ui: call logout before login to clear old sessionkey cookies (#4326) This handle edge cases of upgrades and when legacy UI is used along with Primate or any UI sharing cookies. The specific case it fixes involves removal of duplicate sessionkey cookies. Signed-off-by: Rohit Yadav --- ui/scripts/cloudStack.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js index e6550b730746..9e01271fc137 100644 --- a/ui/scripts/cloudStack.js +++ b/ui/scripts/cloudStack.js @@ -280,6 +280,15 @@ var loginCmdText = array1.join(""); + // Logout before login is called to purge any duplicate sessionkey cookies + // to handle edge cases around upgrades and using legacy UI with Primate + $.ajax({ + url: createURL('logout'), + async: false, + success: function() {}, + error: function() {} + }); + $.ajax({ type: "POST", data: "command=login" + loginCmdText + "&response=json", From 87e08f82249ed35c38a91dc86c33858f3914ff52 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Thu, 17 Sep 2020 10:17:07 +0530 Subject: [PATCH 014/261] cks: fix logging exception (#4309) Signed-off-by: Abhishek Kumar --- .../kubernetes/cluster/KubernetesClusterManagerImpl.java | 4 ++-- .../KubernetesClusterResourceModifierActionWorker.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java index 37e1ecd4b8a1..b05c782d1e80 100644 --- a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java +++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java @@ -537,7 +537,7 @@ private DeployDestination plan(final long nodesCount, final DataCenter zone, fin } if (capacityManager.checkIfHostHasCapacity(h.getId(), cpu_requested * reserved, ram_requested * reserved, false, cpuOvercommitRatio, memoryOvercommitRatio, true)) { if (LOGGER.isDebugEnabled()) { - LOGGER.debug(String.format("Found host ID: %s for with enough capacity, CPU=%d RAM=%d", h.getUuid(), cpu_requested * reserved, toHumanReadableSize(ram_requested * reserved))); + LOGGER.debug(String.format("Found host ID: %s for with enough capacity, CPU=%d RAM=%s", h.getUuid(), cpu_requested * reserved, toHumanReadableSize(ram_requested * reserved))); } hostEntry.setValue(new Pair(h, reserved)); suitable_host_found = true; @@ -558,7 +558,7 @@ private DeployDestination plan(final long nodesCount, final DataCenter zone, fin } return new DeployDestination(zone, null, planCluster, null); } - String msg = String.format("Cannot find enough capacity for Kubernetes cluster(requested cpu=%d memory=%d) with offering ID: %s", + String msg = String.format("Cannot find enough capacity for Kubernetes cluster(requested cpu=%d memory=%s) with offering ID: %s", cpu_requested * nodesCount, toHumanReadableSize(ram_requested * nodesCount), offering.getUuid()); LOGGER.warn(msg); throw new InsufficientServerCapacityException(msg, DataCenter.class, zone.getId()); diff --git a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterResourceModifierActionWorker.java b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterResourceModifierActionWorker.java index e274f5e1a438..d8d41bdf7ac6 100644 --- a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterResourceModifierActionWorker.java +++ b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterResourceModifierActionWorker.java @@ -231,7 +231,7 @@ protected DeployDestination plan(final long nodesCount, final DataCenter zone, f } if (capacityManager.checkIfHostHasCapacity(h.getId(), cpu_requested * reserved, ram_requested * reserved, false, cpuOvercommitRatio, memoryOvercommitRatio, true)) { if (LOGGER.isDebugEnabled()) { - LOGGER.debug(String.format("Found host ID: %s for with enough capacity, CPU=%d RAM=%d", h.getUuid(), cpu_requested * reserved, toHumanReadableSize(ram_requested * reserved))); + LOGGER.debug(String.format("Found host ID: %s for with enough capacity, CPU=%d RAM=%s", h.getUuid(), cpu_requested * reserved, toHumanReadableSize(ram_requested * reserved))); } hostEntry.setValue(new Pair(h, reserved)); suitable_host_found = true; @@ -251,7 +251,7 @@ protected DeployDestination plan(final long nodesCount, final DataCenter zone, f } return new DeployDestination(zone, null, null, null); } - String msg = String.format("Cannot find enough capacity for Kubernetes cluster(requested cpu=%d memory=%d) with offering ID: %s and hypervisor: %s", + String msg = String.format("Cannot find enough capacity for Kubernetes cluster(requested cpu=%d memory=%s) with offering ID: %s and hypervisor: %s", cpu_requested * nodesCount, toHumanReadableSize(ram_requested * nodesCount), offering.getUuid(), clusterTemplate.getHypervisorType().toString()); LOGGER.warn(msg); From 82b6971258a2f63360dbd0cb404fcf87669a5327 Mon Sep 17 00:00:00 2001 From: Pearl Dsilva Date: Thu, 17 Sep 2020 10:20:34 +0530 Subject: [PATCH 015/261] server: Handle listProjects API to list projects with user as members when listAll=true (#4316) * added defensive checks for avoiding NPE and list projects API fix * list projects with account name provided to not include users in the account in response Co-authored-by: Pearl Dsilva --- .../com/cloud/acl/AffinityGroupAccessChecker.java | 2 +- server/src/main/java/com/cloud/acl/DomainChecker.java | 4 ++++ .../java/com/cloud/api/query/QueryManagerImpl.java | 10 +++++++--- .../main/java/com/cloud/network/NetworkModelImpl.java | 3 +++ .../java/com/cloud/projects/ProjectManagerImpl.java | 11 ++++++++--- 5 files changed, 23 insertions(+), 7 deletions(-) diff --git a/server/src/main/java/com/cloud/acl/AffinityGroupAccessChecker.java b/server/src/main/java/com/cloud/acl/AffinityGroupAccessChecker.java index 6106c7268e13..3a648cdcbf0a 100644 --- a/server/src/main/java/com/cloud/acl/AffinityGroupAccessChecker.java +++ b/server/src/main/java/com/cloud/acl/AffinityGroupAccessChecker.java @@ -80,8 +80,8 @@ public boolean checkAccess(Account caller, ControlledEntity entity, AccessType a //check if the group belongs to a project User user = CallContext.current().getCallingUser(); ProjectVO project = _projectDao.findByProjectAccountId(group.getAccountId()); - ProjectAccount userProjectAccount = _projectAccountDao.findByProjectIdUserId(project.getId(), user.getAccountId(), user.getId()); if (project != null) { + ProjectAccount userProjectAccount = _projectAccountDao.findByProjectIdUserId(project.getId(), user.getAccountId(), user.getId()); if (userProjectAccount != null) { if (AccessType.ModifyProject.equals(accessType) && _projectAccountDao.canUserModifyProject(project.getId(), user.getAccountId(), user.getId())) { return true; diff --git a/server/src/main/java/com/cloud/acl/DomainChecker.java b/server/src/main/java/com/cloud/acl/DomainChecker.java index 5fc2b343be9e..24b6b2a42b42 100644 --- a/server/src/main/java/com/cloud/acl/DomainChecker.java +++ b/server/src/main/java/com/cloud/acl/DomainChecker.java @@ -61,6 +61,7 @@ import com.cloud.user.User; import com.cloud.user.dao.AccountDao; import com.cloud.utils.component.AdapterBase; +import com.cloud.utils.exception.CloudRuntimeException; @Component public class DomainChecker extends AdapterBase implements SecurityChecker { @@ -199,6 +200,9 @@ public boolean checkAccess(Account caller, ControlledEntity entity, AccessType a private boolean checkOperationPermitted(Account caller, ControlledEntity entity) { User user = CallContext.current().getCallingUser(); Project project = projectDao.findByProjectAccountId(entity.getAccountId()); + if (project == null) { + throw new CloudRuntimeException("Unable to find project to which the entity belongs to"); + } ProjectAccount projectUser = _projectAccountDao.findByProjectIdUserId(project.getId(), user.getAccountId(), user.getId()); String apiCommandName = CallContext.current().getApiName(); diff --git a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java index 154a29308597..b920f475cbf2 100644 --- a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java @@ -1484,15 +1484,19 @@ private Pair, Integer> listProjectsInternal(ListProjectsCmd } if (accountId != null) { - sb.and("accountId", sb.entity().getAccountId(), SearchCriteria.Op.EQ); + if (userId == null) { + sb.and().op("accountId", sb.entity().getAccountId(), SearchCriteria.Op.EQ); + sb.and("userIdNull", sb.entity().getUserId(), Op.NULL); + sb.cp(); + } else { + sb.and("accountId", sb.entity().getAccountId(), SearchCriteria.Op.EQ); + } } if (userId != null) { sb.and().op("userId", sb.entity().getUserId(), Op.EQ); sb.or("userIdNull", sb.entity().getUserId(), Op.NULL); sb.cp(); - } else { - sb.and("userIdNull", sb.entity().getUserId(), Op.NULL); } SearchCriteria sc = sb.create(); diff --git a/server/src/main/java/com/cloud/network/NetworkModelImpl.java b/server/src/main/java/com/cloud/network/NetworkModelImpl.java index aabcf2b10bfc..b6eab90a98cf 100644 --- a/server/src/main/java/com/cloud/network/NetworkModelImpl.java +++ b/server/src/main/java/com/cloud/network/NetworkModelImpl.java @@ -1658,6 +1658,9 @@ public void checkNetworkPermissions(Account owner, Network network) { if (owner.getType() != Account.ACCOUNT_TYPE_PROJECT && networkOwner.getType() == Account.ACCOUNT_TYPE_PROJECT) { User user = CallContext.current().getCallingUser(); Project project = projectDao.findByProjectAccountId(network.getAccountId()); + if (project == null) { + throw new CloudRuntimeException("Unable to find project to which the network belongs to"); + } ProjectAccount projectAccountUser = _projectAccountDao.findByProjectIdUserId(project.getId(), user.getAccountId(), user.getId()); if (projectAccountUser != null) { if (!_projectAccountDao.canUserAccessProjectAccount(user.getAccountId(), user.getId(), network.getAccountId())) { diff --git a/server/src/main/java/com/cloud/projects/ProjectManagerImpl.java b/server/src/main/java/com/cloud/projects/ProjectManagerImpl.java index 90a27fcafd01..88ad0c2ffc9d 100644 --- a/server/src/main/java/com/cloud/projects/ProjectManagerImpl.java +++ b/server/src/main/java/com/cloud/projects/ProjectManagerImpl.java @@ -239,6 +239,9 @@ public Project createProject(final String name, final String displayText, String } User user = validateUser(userId, accountId, domainId); + if (user != null) { + owner = _accountDao.findById(user.getAccountId()); + } //do resource limit check _resourceLimitMgr.checkResourceLimit(owner, ResourceType.project); @@ -559,9 +562,11 @@ public boolean canAccessProjectAccount(Account caller, long accountId) { } User user = CallContext.current().getCallingUser(); ProjectVO project = _projectDao.findByProjectAccountId(accountId); - ProjectAccount userProjectAccount = _projectAccountDao.findByProjectIdUserId(project.getId(), user.getAccountId(), user.getId()); - if (userProjectAccount != null) { - return _projectAccountDao.canUserAccessProjectAccount(user.getAccountId(), user.getId(), accountId); + if (project != null) { + ProjectAccount userProjectAccount = _projectAccountDao.findByProjectIdUserId(project.getId(), user.getAccountId(), user.getId()); + if (userProjectAccount != null) { + return _projectAccountDao.canUserAccessProjectAccount(user.getAccountId(), user.getId(), accountId); + } } return _projectAccountDao.canAccessProjectAccount(caller.getId(), accountId); } From 90e72b1e408fa3a398de795a1cced4ff37f2be20 Mon Sep 17 00:00:00 2001 From: Pearl Dsilva Date: Fri, 18 Sep 2020 08:25:17 +0530 Subject: [PATCH 016/261] vmware: Create template from detached data-disks on VMWare (#4294) Creation of templates from detached data disks results in a Null Pointer Exception on VMWare, as it expects the volume to be attached to a VM. To fix this behavior and make it consistent with other hypervisors, creation of the template from the volume in case not attached to a VM is facilitated by creating a worker VM, attaching the disk to the worker VM, creating the template from it, and then destroying the VM. Co-authored-by: Pearl Dsilva --- .../resource/VmwareStorageProcessor.java | 61 +++++++++++++------ 1 file changed, 41 insertions(+), 20 deletions(-) diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java index e5fae17ed515..f8b8f4c1f340 100644 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java +++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java @@ -1186,31 +1186,43 @@ public Answer createTemplateFromVolume(CopyCommand cmd) { String volumePath = volume.getPath(); String details = null; - + VirtualMachineMO vmMo = null; + VirtualMachineMO workerVmMo = null; VmwareContext context = hostService.getServiceContext(cmd); try { VmwareHypervisorHost hyperHost = hostService.getHyperHost(context, cmd); - - VirtualMachineMO vmMo = hyperHost.findVmOnHyperHost(volume.getVmName()); - if (vmMo == null) { - if (s_logger.isDebugEnabled()) { - s_logger.debug("Unable to find the owner VM for CreatePrivateTemplateFromVolumeCommand on host " + hyperHost.getHyperHostName() + - ", try within datacenter"); - } - vmMo = hyperHost.findVmOnPeerHyperHost(volume.getVmName()); - + if (volume.getVmName() == null) { + ManagedObjectReference secMorDs = HypervisorHostHelper.findDatastoreWithBackwardsCompatibility(hyperHost, volume.getDataStore().getUuid()); + DatastoreMO dsMo = new DatastoreMO(hyperHost.getContext(), secMorDs); + workerVmMo = HypervisorHostHelper.createWorkerVM(hyperHost, dsMo, "workervm"+volume.getUuid()); + if (workerVmMo == null) { + throw new Exception("Unable to find created worker VM"); + } + vmMo = workerVmMo; + String vmdkDataStorePath = VmwareStorageLayoutHelper.getLegacyDatastorePathFromVmdkFileName(dsMo, volumePath + ".vmdk"); + vmMo.attachDisk(new String[] {vmdkDataStorePath}, secMorDs); + } else { + vmMo = hyperHost.findVmOnHyperHost(volume.getVmName()); if (vmMo == null) { - // This means either the volume is on a zone wide storage pool or VM is deleted by external entity. - // Look for the VM in the datacenter. - ManagedObjectReference dcMor = hyperHost.getHyperHostDatacenter(); - DatacenterMO dcMo = new DatacenterMO(context, dcMor); - vmMo = dcMo.findVm(volume.getVmName()); - } + if (s_logger.isDebugEnabled()) { + s_logger.debug("Unable to find the owner VM for CreatePrivateTemplateFromVolumeCommand on host " + hyperHost.getHyperHostName() + + ", try within datacenter"); + } + vmMo = hyperHost.findVmOnPeerHyperHost(volume.getVmName()); - if (vmMo == null) { - String msg = "Unable to find the owner VM for volume operation. vm: " + volume.getVmName(); - s_logger.error(msg); - throw new Exception(msg); + if (vmMo == null) { + // This means either the volume is on a zone wide storage pool or VM is deleted by external entity. + // Look for the VM in the datacenter. + ManagedObjectReference dcMor = hyperHost.getHyperHostDatacenter(); + DatacenterMO dcMo = new DatacenterMO(context, dcMor); + vmMo = dcMo.findVm(volume.getVmName()); + } + + if (vmMo == null) { + String msg = "Unable to find the owner VM for volume operation. vm: " + volume.getVmName(); + s_logger.error(msg); + throw new Exception(msg); + } } } @@ -1234,6 +1246,15 @@ public Answer createTemplateFromVolume(CopyCommand cmd) { details = "create template from volume exception: " + VmwareHelper.getExceptionMessage(e); return new CopyCmdAnswer(details); + } finally { + try { + if (volume.getVmName() == null && workerVmMo != null) { + workerVmMo.detachAllDisks(); + workerVmMo.destroy(); + } + } catch (Throwable e) { + s_logger.error("Failed to destroy worker VM created for detached volume"); + } } } From 238eccc317f422d0007b7428c5cf7f4f10334362 Mon Sep 17 00:00:00 2001 From: Andrija Panic <45762285+andrijapanicsb@users.noreply.github.com> Date: Mon, 21 Sep 2020 10:42:52 +0200 Subject: [PATCH 017/261] packaging: Minor message update (#4333) adding quotes, to fix the "servers" to "server's" --- debian/cloudstack-usage.postinst | 4 ++-- packaging/centos7/cloud.spec | 4 ++-- packaging/centos8/cloud.spec | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/cloudstack-usage.postinst b/debian/cloudstack-usage.postinst index fc4a46b4eb70..61fac8338053 100755 --- a/debian/cloudstack-usage.postinst +++ b/debian/cloudstack-usage.postinst @@ -24,7 +24,7 @@ case "$1" in # Linking usage server db.properties to management server db.properties if [ -f "/etc/cloudstack/management/db.properties" ]; then - echo Replacing usage server's db.properties with a link to the management server's db.properties + echo "Replacing usage server's db.properties with a link to the management server's db.properties" rm -f /etc/cloudstack/usage/db.properties ln -s /etc/cloudstack/management/db.properties /etc/cloudstack/usage/db.properties fi @@ -36,7 +36,7 @@ case "$1" in # Replacing key with management server key if [ -f "/etc/cloudstack/management/key" ]; then - echo Replacing usage server's key with a link to the management server's key + echo "Replacing usage server's key with a link to the management server's key" rm -f /etc/cloudstack/usage/key ln -s /etc/cloudstack/management/key /etc/cloudstack/usage/key fi diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec index aa90a435a343..366df32fcd17 100644 --- a/packaging/centos7/cloud.spec +++ b/packaging/centos7/cloud.spec @@ -465,14 +465,14 @@ fi %post usage if [ -f "%{_sysconfdir}/%{name}/management/db.properties" ]; then - echo Replacing usage server's db.properties with a link to the management server's db.properties + echo "Replacing usage server's db.properties with a link to the management server's db.properties" rm -f %{_sysconfdir}/%{name}/usage/db.properties ln -s %{_sysconfdir}/%{name}/management/db.properties %{_sysconfdir}/%{name}/usage/db.properties /usr/bin/systemctl enable cloudstack-usage > /dev/null 2>&1 || true fi if [ -f "%{_sysconfdir}/%{name}/management/key" ]; then - echo Replacing usage server's key with a link to the management server's key + echo "Replacing usage server's key with a link to the management server's key" rm -f %{_sysconfdir}/%{name}/usage/key ln -s %{_sysconfdir}/%{name}/management/key %{_sysconfdir}/%{name}/usage/key fi diff --git a/packaging/centos8/cloud.spec b/packaging/centos8/cloud.spec index c30702f04db1..f893e786d35b 100644 --- a/packaging/centos8/cloud.spec +++ b/packaging/centos8/cloud.spec @@ -462,14 +462,14 @@ fi %post usage if [ -f "%{_sysconfdir}/%{name}/management/db.properties" ]; then - echo Replacing usage server's db.properties with a link to the management server's db.properties + echo "Replacing usage server's db.properties with a link to the management server's db.properties" rm -f %{_sysconfdir}/%{name}/usage/db.properties ln -s %{_sysconfdir}/%{name}/management/db.properties %{_sysconfdir}/%{name}/usage/db.properties /usr/bin/systemctl enable cloudstack-usage > /dev/null 2>&1 || true fi if [ -f "%{_sysconfdir}/%{name}/management/key" ]; then - echo Replacing usage server's key with a link to the management server's key + echo "Replacing usage server's key with a link to the management server's key" rm -f %{_sysconfdir}/%{name}/usage/key ln -s %{_sysconfdir}/%{name}/management/key %{_sysconfdir}/%{name}/usage/key fi From cfbb4ff3dd5a53f55040d3345b96bc7e97964eb2 Mon Sep 17 00:00:00 2001 From: Pearl Dsilva Date: Tue, 22 Sep 2020 09:40:51 +0530 Subject: [PATCH 018/261] schema: change upgrade path to 4.14 (from 4.13) and intensify check (#4331) * change upgrade path to 4.14 (from 4.13) and intensify check * extracted check Co-authored-by: Pearl Dsilva --- .../META-INF/db/schema-41310to41400.sql | 27 ------------------- .../META-INF/db/schema-41400to41500.sql | 26 ++++++++++++++++++ .../resource/NfsSecondaryStorageResource.java | 16 +++++++++-- 3 files changed, 40 insertions(+), 29 deletions(-) diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41310to41400.sql b/engine/schema/src/main/resources/META-INF/db/schema-41310to41400.sql index a1a2e742b0c1..baa7bcf96178 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-41310to41400.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-41310to41400.sql @@ -53,33 +53,6 @@ ALTER TABLE `cloud`.`vm_instance` ADD COLUMN `backup_offering_id` bigint unsigne ALTER TABLE `cloud`.`vm_instance` ADD COLUMN `backup_external_id` varchar(255) DEFAULT NULL COMMENT 'ID of external backup job or container if any'; ALTER TABLE `cloud`.`vm_instance` ADD COLUMN `backup_volumes` text DEFAULT NULL COMMENT 'details of backedup volumes'; -ALTER TABLE `cloud`.`image_store` ADD COLUMN `readonly` boolean DEFAULT false COMMENT 'defines status of image store'; - -ALTER VIEW `cloud`.`image_store_view` AS - select - image_store.id, - image_store.uuid, - image_store.name, - image_store.image_provider_name, - image_store.protocol, - image_store.url, - image_store.scope, - image_store.role, - image_store.readonly, - image_store.removed, - data_center.id data_center_id, - data_center.uuid data_center_uuid, - data_center.name data_center_name, - image_store_details.name detail_name, - image_store_details.value detail_value - from - `cloud`.`image_store` - left join - `cloud`.`data_center` ON image_store.data_center_id = data_center.id - left join - `cloud`.`image_store_details` ON image_store_details.store_id = image_store.id; - - CREATE TABLE IF NOT EXISTS `cloud`.`backups` ( `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, `uuid` varchar(40) NOT NULL UNIQUE, diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41400to41500.sql b/engine/schema/src/main/resources/META-INF/db/schema-41400to41500.sql index ab715f303f85..20ed35c1f5b2 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-41400to41500.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-41400to41500.sql @@ -194,3 +194,29 @@ INSERT IGNORE INTO `cloud`.`hypervisor_capabilities`(uuid, hypervisor_type, hype -- Copy XenServer 8.0 hypervisor guest OS mappings to XenServer8.1 INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) SELECT UUID(),'Xenserver', '8.1.0', guest_os_name, guest_os_id, utc_timestamp(), 0 FROM `cloud`.`guest_os_hypervisor` WHERE hypervisor_type='Xenserver' AND hypervisor_version='8.0.0'; + +ALTER TABLE `cloud`.`image_store` ADD COLUMN `readonly` boolean DEFAULT false COMMENT 'defines status of image store'; + +ALTER VIEW `cloud`.`image_store_view` AS + select + image_store.id, + image_store.uuid, + image_store.name, + image_store.image_provider_name, + image_store.protocol, + image_store.url, + image_store.scope, + image_store.role, + image_store.readonly, + image_store.removed, + data_center.id data_center_id, + data_center.uuid data_center_uuid, + data_center.name data_center_name, + image_store_details.name detail_name, + image_store_details.value detail_value + from + `cloud`.`image_store` + left join + `cloud`.`data_center` ON image_store.data_center_id = data_center.id + left join + `cloud`.`image_store_details` ON image_store_details.store_id = image_store.id; diff --git a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java index 0832ab6e496b..dd002a9a2367 100644 --- a/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java +++ b/services/secondary-storage/server/src/main/java/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java @@ -1044,13 +1044,25 @@ protected Answer copyFromNfsToImage(CopyCommand cmd) { } } + private boolean shouldPerformDataMigration(DataTO srcData, DataTO destData) { + DataStoreTO srcDataStore = srcData.getDataStore(); + DataStoreTO destDataStore = destData.getDataStore(); + if (DataStoreRole.Image == srcDataStore.getRole() && DataStoreRole.Image == destDataStore.getRole() && + srcDataStore instanceof NfsTO && destDataStore instanceof NfsTO && + ((srcData.getObjectType() == DataObjectType.TEMPLATE && destData.getObjectType() == DataObjectType.TEMPLATE) || + (srcData.getObjectType() == DataObjectType.SNAPSHOT && destData.getObjectType() == DataObjectType.SNAPSHOT) || + (srcData.getObjectType() == DataObjectType.VOLUME && destData.getObjectType() == DataObjectType.VOLUME))) { + return true; + } + return false; + } + protected Answer execute(CopyCommand cmd) { DataTO srcData = cmd.getSrcTO(); DataTO destData = cmd.getDestTO(); DataStoreTO srcDataStore = srcData.getDataStore(); DataStoreTO destDataStore = destData.getDataStore(); - - if (DataStoreRole.Image == srcDataStore.getRole() && DataStoreRole.Image == destDataStore.getRole()) { + if (shouldPerformDataMigration(srcData, destData)) { return copyFromNfsToNfs(cmd); } From dc65f31f9f3cb47240946c8c1cced44a7ecf9640 Mon Sep 17 00:00:00 2001 From: Lucas Granet Date: Tue, 22 Sep 2020 09:37:56 +0200 Subject: [PATCH 019/261] router: adding "data-server" dns entry in /etc/hosts (#4319) The DNS entry "data-server" was not added in /etc/hosts. Since the VR is now considered as a "dhcpsrvr" (?), we need to apply this commit to add this DNS entry. /etc/hosts is fully rewritten by this script. Fixes: #4308 --- systemvm/debian/opt/cloud/bin/cs/CsDhcp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systemvm/debian/opt/cloud/bin/cs/CsDhcp.py b/systemvm/debian/opt/cloud/bin/cs/CsDhcp.py index c2c00d5817ac..ef1a52dec1c9 100755 --- a/systemvm/debian/opt/cloud/bin/cs/CsDhcp.py +++ b/systemvm/debian/opt/cloud/bin/cs/CsDhcp.py @@ -158,7 +158,7 @@ def preseed(self): self.add_host("::1", "localhost ip6-localhost ip6-loopback") self.add_host("ff02::1", "ip6-allnodes") self.add_host("ff02::2", "ip6-allrouters") - if self.config.is_router(): + if self.config.is_router() or self.config.is_dhcp(): self.add_host(self.config.address().get_guest_ip(), "%s data-server" % CsHelper.get_hostname()) def write_hosts(self): From c06e7ded3c52b18eb92ec0dd53f0884db0b91004 Mon Sep 17 00:00:00 2001 From: davidjumani Date: Tue, 22 Sep 2020 17:42:30 +0530 Subject: [PATCH 020/261] systemvm: update novnc v1.2.0 (#4323) Update noVNC v1.2.0, add support for clipboard, explicit button toolbar and resize screensize --- .../cloud/servlet/ConsoleProxyServlet.java | 2 +- systemvm/agent/noVNC/.eslintignore | 1 - systemvm/agent/noVNC/.eslintrc | 48 - .../.github/ISSUE_TEMPLATE/bug_report.md | 34 - .../.github/ISSUE_TEMPLATE/feature_request.md | 17 - systemvm/agent/noVNC/.gitignore | 12 - systemvm/agent/noVNC/.gitmodules | 0 systemvm/agent/noVNC/.travis.yml | 58 - systemvm/agent/noVNC/AUTHORS | 13 - systemvm/agent/noVNC/LICENSE.txt | 68 - systemvm/agent/noVNC/README.md | 152 -- systemvm/agent/noVNC/VERSION | 1 - systemvm/agent/noVNC/app/error-handler.js | 8 + systemvm/agent/noVNC/app/images/alt.png | Bin 0 -> 335 bytes systemvm/agent/noVNC/app/images/alt.svg | 92 - systemvm/agent/noVNC/app/images/clipboard.png | Bin 0 -> 220 bytes systemvm/agent/noVNC/app/images/clipboard.svg | 106 - systemvm/agent/noVNC/app/images/connect.png | Bin 0 -> 424 bytes systemvm/agent/noVNC/app/images/connect.svg | 96 - systemvm/agent/noVNC/app/images/ctrl.png | Bin 0 -> 399 bytes systemvm/agent/noVNC/app/images/ctrl.svg | 96 - .../agent/noVNC/app/images/ctrlaltdel.png | Bin 0 -> 191 bytes .../agent/noVNC/app/images/ctrlaltdel.svg | 100 - .../agent/noVNC/app/images/disconnect.png | Bin 0 -> 442 bytes .../agent/noVNC/app/images/disconnect.svg | 94 - systemvm/agent/noVNC/app/images/drag.png | Bin 0 -> 336 bytes systemvm/agent/noVNC/app/images/drag.svg | 76 - systemvm/agent/noVNC/app/images/error.png | Bin 0 -> 348 bytes systemvm/agent/noVNC/app/images/error.svg | 81 - systemvm/agent/noVNC/app/images/esc.png | Bin 0 -> 365 bytes systemvm/agent/noVNC/app/images/esc.svg | 92 - systemvm/agent/noVNC/app/images/expander.png | Bin 0 -> 167 bytes systemvm/agent/noVNC/app/images/expander.svg | 69 - .../agent/noVNC/app/images/fullscreen.png | Bin 0 -> 280 bytes .../agent/noVNC/app/images/fullscreen.svg | 93 - systemvm/agent/noVNC/app/images/handle.png | Bin 0 -> 126 bytes systemvm/agent/noVNC/app/images/handle.svg | 82 - systemvm/agent/noVNC/app/images/handle_bg.png | Bin 0 -> 123 bytes systemvm/agent/noVNC/app/images/handle_bg.svg | 172 -- systemvm/agent/noVNC/app/images/info.png | Bin 0 -> 448 bytes systemvm/agent/noVNC/app/images/info.svg | 81 - systemvm/agent/noVNC/app/images/keyboard.png | Bin 0 -> 308 bytes systemvm/agent/noVNC/app/images/keyboard.svg | 88 - .../agent/noVNC/app/images/mouse_left.svg | 92 - .../agent/noVNC/app/images/mouse_middle.svg | 92 - .../agent/noVNC/app/images/mouse_none.svg | 92 - .../agent/noVNC/app/images/mouse_right.svg | 92 - systemvm/agent/noVNC/app/images/power.png | Bin 0 -> 421 bytes systemvm/agent/noVNC/app/images/power.svg | 87 - systemvm/agent/noVNC/app/images/settings.png | Bin 0 -> 379 bytes systemvm/agent/noVNC/app/images/settings.svg | 76 - systemvm/agent/noVNC/app/images/tab.png | Bin 0 -> 190 bytes systemvm/agent/noVNC/app/images/tab.svg | 86 - .../noVNC/app/images/toggleextrakeys.png | Bin 0 -> 353 bytes .../noVNC/app/images/toggleextrakeys.svg | 90 - systemvm/agent/noVNC/app/images/warning.png | Bin 0 -> 319 bytes systemvm/agent/noVNC/app/images/warning.svg | 81 - systemvm/agent/noVNC/app/images/windows.png | Bin 0 -> 219 bytes systemvm/agent/noVNC/app/images/windows.svg | 85 - systemvm/agent/noVNC/app/locale/README | 1 + systemvm/agent/noVNC/app/locale/ja.json | 73 + systemvm/agent/noVNC/app/locale/sv.json | 15 +- systemvm/agent/noVNC/app/locale/zh_CN.json | 34 +- systemvm/agent/noVNC/app/styles/base.css | 104 +- systemvm/agent/noVNC/app/ui.js | 349 +-- systemvm/agent/noVNC/app/webutil.js | 43 +- systemvm/agent/noVNC/core/base64.js | 8 +- .../agent/noVNC/core/decoders/copyrect.js | 9 +- systemvm/agent/noVNC/core/decoders/hextile.js | 82 +- systemvm/agent/noVNC/core/decoders/raw.js | 30 +- systemvm/agent/noVNC/core/decoders/rre.js | 4 +- systemvm/agent/noVNC/core/decoders/tight.js | 52 +- .../agent/noVNC/core/decoders/tightpng.js | 6 +- systemvm/agent/noVNC/core/deflator.js | 85 + systemvm/agent/noVNC/core/display.js | 296 +- systemvm/agent/noVNC/core/encodings.js | 5 +- systemvm/agent/noVNC/core/inflator.js | 42 +- .../agent/noVNC/core/input/domkeytable.js | 14 +- .../agent/noVNC/core/input/gesturehandler.js | 567 ++++ systemvm/agent/noVNC/core/input/keyboard.js | 40 +- systemvm/agent/noVNC/core/input/mouse.js | 276 -- systemvm/agent/noVNC/core/input/uskeysym.js | 57 + systemvm/agent/noVNC/core/input/util.js | 50 +- systemvm/agent/noVNC/core/rfb.js | 1535 +++++++++-- systemvm/agent/noVNC/core/util/browser.js | 42 +- systemvm/agent/noVNC/core/util/cursor.js | 100 +- systemvm/agent/noVNC/core/util/element.js | 32 + systemvm/agent/noVNC/core/util/events.js | 91 +- systemvm/agent/noVNC/core/util/eventtarget.js | 2 +- systemvm/agent/noVNC/core/util/int.js | 15 + systemvm/agent/noVNC/core/util/logging.js | 16 +- systemvm/agent/noVNC/core/util/polyfill.js | 9 +- systemvm/agent/noVNC/core/util/strings.js | 26 +- systemvm/agent/noVNC/core/websock.js | 66 +- systemvm/agent/noVNC/docs/API-internal.md | 122 - systemvm/agent/noVNC/docs/API.md | 375 --- systemvm/agent/noVNC/docs/EMBEDDING.md | 119 - systemvm/agent/noVNC/docs/LIBRARY.md | 35 - .../agent/noVNC/docs/LICENSE.BSD-2-Clause | 22 - .../agent/noVNC/docs/LICENSE.BSD-3-Clause | 24 - systemvm/agent/noVNC/docs/LICENSE.MPL-2.0 | 373 --- systemvm/agent/noVNC/docs/LICENSE.OFL-1.1 | 91 - systemvm/agent/noVNC/docs/flash_policy.txt | 4 - systemvm/agent/noVNC/docs/links | 76 - systemvm/agent/noVNC/docs/notes | 5 - systemvm/agent/noVNC/docs/rfb_notes | 147 - systemvm/agent/noVNC/docs/rfbproto-3.3.pdf | Bin 110778 -> 0 bytes systemvm/agent/noVNC/docs/rfbproto-3.7.pdf | Bin 165552 -> 0 bytes systemvm/agent/noVNC/docs/rfbproto-3.8.pdf | Bin 143840 -> 0 bytes systemvm/agent/noVNC/karma.conf.js | 134 - systemvm/agent/noVNC/package.json | 62 +- systemvm/agent/noVNC/po/Makefile | 35 - systemvm/agent/noVNC/po/cs.po | 294 -- systemvm/agent/noVNC/po/de.po | 303 --- systemvm/agent/noVNC/po/el.po | 323 --- systemvm/agent/noVNC/po/es.po | 283 -- systemvm/agent/noVNC/po/ko.po | 290 -- systemvm/agent/noVNC/po/nl.po | 322 --- systemvm/agent/noVNC/po/noVNC.pot | 302 --- systemvm/agent/noVNC/po/pl.po | 325 --- systemvm/agent/noVNC/po/po2js | 43 - systemvm/agent/noVNC/po/ru.po | 306 --- systemvm/agent/noVNC/po/sv.po | 316 --- systemvm/agent/noVNC/po/tr.po | 288 -- systemvm/agent/noVNC/po/xgettext-html | 115 - systemvm/agent/noVNC/po/zh_CN.po | 284 -- systemvm/agent/noVNC/po/zh_TW.po | 285 -- systemvm/agent/noVNC/tests/.eslintrc | 15 - systemvm/agent/noVNC/tests/assertions.js | 101 - systemvm/agent/noVNC/tests/fake.websocket.js | 96 - systemvm/agent/noVNC/tests/karma-test-main.js | 48 - systemvm/agent/noVNC/tests/playback-ui.js | 210 -- systemvm/agent/noVNC/tests/playback.js | 172 -- systemvm/agent/noVNC/tests/test.base64.js | 33 - systemvm/agent/noVNC/tests/test.display.js | 486 ---- systemvm/agent/noVNC/tests/test.helper.js | 223 -- systemvm/agent/noVNC/tests/test.keyboard.js | 510 ---- .../agent/noVNC/tests/test.localization.js | 72 - systemvm/agent/noVNC/tests/test.mouse.js | 304 --- systemvm/agent/noVNC/tests/test.rfb.js | 2389 ----------------- systemvm/agent/noVNC/tests/test.util.js | 69 - systemvm/agent/noVNC/tests/test.websock.js | 441 --- systemvm/agent/noVNC/tests/test.webutil.js | 184 -- systemvm/agent/noVNC/tests/vnc_playback.html | 43 - systemvm/agent/noVNC/utils/.eslintrc | 8 - systemvm/agent/noVNC/utils/README.md | 14 - systemvm/agent/noVNC/utils/b64-to-binary.pl | 17 - systemvm/agent/noVNC/utils/genkeysymdef.js | 127 - systemvm/agent/noVNC/utils/img2js.py | 40 - systemvm/agent/noVNC/utils/json2graph.py | 206 -- systemvm/agent/noVNC/utils/launch.sh | 169 -- systemvm/agent/noVNC/utils/u2x11 | 28 - systemvm/agent/noVNC/utils/use_require.js | 313 --- .../agent/noVNC/utils/use_require_helpers.js | 76 - systemvm/agent/noVNC/utils/validate | 45 - .../vendor/browser-es-module-loader/README.md | 4 +- .../browser-es-module-loader/genworker.js | 13 + .../browser-es-module-loader/rollup.config.js | 15 +- .../src/babel-worker.js | 18 +- .../src/browser-es-module-loader.js | 1 - .../noVNC/vendor/pako/lib/zlib/deflate.js | 60 +- .../noVNC/vendor/pako/lib/zlib/inflate.js | 34 +- systemvm/agent/noVNC/vnc.html | 303 ++- systemvm/agent/noVNC/vnc_lite.html | 19 +- 164 files changed, 3227 insertions(+), 16263 deletions(-) delete mode 100644 systemvm/agent/noVNC/.eslintignore delete mode 100644 systemvm/agent/noVNC/.eslintrc delete mode 100644 systemvm/agent/noVNC/.github/ISSUE_TEMPLATE/bug_report.md delete mode 100644 systemvm/agent/noVNC/.github/ISSUE_TEMPLATE/feature_request.md delete mode 100644 systemvm/agent/noVNC/.gitignore delete mode 100644 systemvm/agent/noVNC/.gitmodules delete mode 100644 systemvm/agent/noVNC/.travis.yml delete mode 100644 systemvm/agent/noVNC/AUTHORS delete mode 100644 systemvm/agent/noVNC/LICENSE.txt delete mode 100644 systemvm/agent/noVNC/README.md delete mode 100644 systemvm/agent/noVNC/VERSION create mode 100644 systemvm/agent/noVNC/app/images/alt.png delete mode 100644 systemvm/agent/noVNC/app/images/alt.svg create mode 100644 systemvm/agent/noVNC/app/images/clipboard.png delete mode 100644 systemvm/agent/noVNC/app/images/clipboard.svg create mode 100644 systemvm/agent/noVNC/app/images/connect.png delete mode 100644 systemvm/agent/noVNC/app/images/connect.svg create mode 100644 systemvm/agent/noVNC/app/images/ctrl.png delete mode 100644 systemvm/agent/noVNC/app/images/ctrl.svg create mode 100644 systemvm/agent/noVNC/app/images/ctrlaltdel.png delete mode 100644 systemvm/agent/noVNC/app/images/ctrlaltdel.svg create mode 100644 systemvm/agent/noVNC/app/images/disconnect.png delete mode 100644 systemvm/agent/noVNC/app/images/disconnect.svg create mode 100644 systemvm/agent/noVNC/app/images/drag.png delete mode 100644 systemvm/agent/noVNC/app/images/drag.svg create mode 100644 systemvm/agent/noVNC/app/images/error.png delete mode 100644 systemvm/agent/noVNC/app/images/error.svg create mode 100644 systemvm/agent/noVNC/app/images/esc.png delete mode 100644 systemvm/agent/noVNC/app/images/esc.svg create mode 100644 systemvm/agent/noVNC/app/images/expander.png delete mode 100644 systemvm/agent/noVNC/app/images/expander.svg create mode 100644 systemvm/agent/noVNC/app/images/fullscreen.png delete mode 100644 systemvm/agent/noVNC/app/images/fullscreen.svg create mode 100644 systemvm/agent/noVNC/app/images/handle.png delete mode 100644 systemvm/agent/noVNC/app/images/handle.svg create mode 100644 systemvm/agent/noVNC/app/images/handle_bg.png delete mode 100644 systemvm/agent/noVNC/app/images/handle_bg.svg create mode 100644 systemvm/agent/noVNC/app/images/info.png delete mode 100644 systemvm/agent/noVNC/app/images/info.svg create mode 100644 systemvm/agent/noVNC/app/images/keyboard.png delete mode 100644 systemvm/agent/noVNC/app/images/keyboard.svg delete mode 100644 systemvm/agent/noVNC/app/images/mouse_left.svg delete mode 100644 systemvm/agent/noVNC/app/images/mouse_middle.svg delete mode 100644 systemvm/agent/noVNC/app/images/mouse_none.svg delete mode 100644 systemvm/agent/noVNC/app/images/mouse_right.svg create mode 100644 systemvm/agent/noVNC/app/images/power.png delete mode 100644 systemvm/agent/noVNC/app/images/power.svg create mode 100644 systemvm/agent/noVNC/app/images/settings.png delete mode 100644 systemvm/agent/noVNC/app/images/settings.svg create mode 100644 systemvm/agent/noVNC/app/images/tab.png delete mode 100644 systemvm/agent/noVNC/app/images/tab.svg create mode 100644 systemvm/agent/noVNC/app/images/toggleextrakeys.png delete mode 100644 systemvm/agent/noVNC/app/images/toggleextrakeys.svg create mode 100644 systemvm/agent/noVNC/app/images/warning.png delete mode 100644 systemvm/agent/noVNC/app/images/warning.svg create mode 100644 systemvm/agent/noVNC/app/images/windows.png delete mode 100644 systemvm/agent/noVNC/app/images/windows.svg create mode 100644 systemvm/agent/noVNC/app/locale/README create mode 100644 systemvm/agent/noVNC/app/locale/ja.json create mode 100644 systemvm/agent/noVNC/core/deflator.js create mode 100644 systemvm/agent/noVNC/core/input/gesturehandler.js delete mode 100644 systemvm/agent/noVNC/core/input/mouse.js create mode 100644 systemvm/agent/noVNC/core/input/uskeysym.js create mode 100644 systemvm/agent/noVNC/core/util/element.js create mode 100644 systemvm/agent/noVNC/core/util/int.js delete mode 100644 systemvm/agent/noVNC/docs/API-internal.md delete mode 100644 systemvm/agent/noVNC/docs/API.md delete mode 100644 systemvm/agent/noVNC/docs/EMBEDDING.md delete mode 100644 systemvm/agent/noVNC/docs/LIBRARY.md delete mode 100644 systemvm/agent/noVNC/docs/LICENSE.BSD-2-Clause delete mode 100644 systemvm/agent/noVNC/docs/LICENSE.BSD-3-Clause delete mode 100644 systemvm/agent/noVNC/docs/LICENSE.MPL-2.0 delete mode 100644 systemvm/agent/noVNC/docs/LICENSE.OFL-1.1 delete mode 100644 systemvm/agent/noVNC/docs/flash_policy.txt delete mode 100644 systemvm/agent/noVNC/docs/links delete mode 100644 systemvm/agent/noVNC/docs/notes delete mode 100644 systemvm/agent/noVNC/docs/rfb_notes delete mode 100644 systemvm/agent/noVNC/docs/rfbproto-3.3.pdf delete mode 100644 systemvm/agent/noVNC/docs/rfbproto-3.7.pdf delete mode 100644 systemvm/agent/noVNC/docs/rfbproto-3.8.pdf delete mode 100644 systemvm/agent/noVNC/karma.conf.js delete mode 100644 systemvm/agent/noVNC/po/Makefile delete mode 100644 systemvm/agent/noVNC/po/cs.po delete mode 100644 systemvm/agent/noVNC/po/de.po delete mode 100644 systemvm/agent/noVNC/po/el.po delete mode 100644 systemvm/agent/noVNC/po/es.po delete mode 100644 systemvm/agent/noVNC/po/ko.po delete mode 100644 systemvm/agent/noVNC/po/nl.po delete mode 100644 systemvm/agent/noVNC/po/noVNC.pot delete mode 100644 systemvm/agent/noVNC/po/pl.po delete mode 100755 systemvm/agent/noVNC/po/po2js delete mode 100644 systemvm/agent/noVNC/po/ru.po delete mode 100644 systemvm/agent/noVNC/po/sv.po delete mode 100644 systemvm/agent/noVNC/po/tr.po delete mode 100755 systemvm/agent/noVNC/po/xgettext-html delete mode 100644 systemvm/agent/noVNC/po/zh_CN.po delete mode 100644 systemvm/agent/noVNC/po/zh_TW.po delete mode 100644 systemvm/agent/noVNC/tests/.eslintrc delete mode 100644 systemvm/agent/noVNC/tests/assertions.js delete mode 100644 systemvm/agent/noVNC/tests/fake.websocket.js delete mode 100644 systemvm/agent/noVNC/tests/karma-test-main.js delete mode 100644 systemvm/agent/noVNC/tests/playback-ui.js delete mode 100644 systemvm/agent/noVNC/tests/playback.js delete mode 100644 systemvm/agent/noVNC/tests/test.base64.js delete mode 100644 systemvm/agent/noVNC/tests/test.display.js delete mode 100644 systemvm/agent/noVNC/tests/test.helper.js delete mode 100644 systemvm/agent/noVNC/tests/test.keyboard.js delete mode 100644 systemvm/agent/noVNC/tests/test.localization.js delete mode 100644 systemvm/agent/noVNC/tests/test.mouse.js delete mode 100644 systemvm/agent/noVNC/tests/test.rfb.js delete mode 100644 systemvm/agent/noVNC/tests/test.util.js delete mode 100644 systemvm/agent/noVNC/tests/test.websock.js delete mode 100644 systemvm/agent/noVNC/tests/test.webutil.js delete mode 100644 systemvm/agent/noVNC/tests/vnc_playback.html delete mode 100644 systemvm/agent/noVNC/utils/.eslintrc delete mode 100644 systemvm/agent/noVNC/utils/README.md delete mode 100755 systemvm/agent/noVNC/utils/b64-to-binary.pl delete mode 100755 systemvm/agent/noVNC/utils/genkeysymdef.js delete mode 100755 systemvm/agent/noVNC/utils/img2js.py delete mode 100755 systemvm/agent/noVNC/utils/json2graph.py delete mode 100755 systemvm/agent/noVNC/utils/launch.sh delete mode 100755 systemvm/agent/noVNC/utils/u2x11 delete mode 100755 systemvm/agent/noVNC/utils/use_require.js delete mode 100644 systemvm/agent/noVNC/utils/use_require_helpers.js delete mode 100755 systemvm/agent/noVNC/utils/validate create mode 100755 systemvm/agent/noVNC/vendor/browser-es-module-loader/genworker.js diff --git a/server/src/main/java/com/cloud/servlet/ConsoleProxyServlet.java b/server/src/main/java/com/cloud/servlet/ConsoleProxyServlet.java index ed73625d7e9c..b735be811e2a 100644 --- a/server/src/main/java/com/cloud/servlet/ConsoleProxyServlet.java +++ b/server/src/main/java/com/cloud/servlet/ConsoleProxyServlet.java @@ -484,7 +484,7 @@ private String composeConsoleAccessUrl(String rootUrl, VirtualMachine vm, HostVO if (param.getHypervHost() != null || !ConsoleProxyManager.NoVncConsoleDefault.value()) { sb.append("/ajax?token=" + encryptor.encryptObject(ConsoleProxyClientParam.class, param)); } else { - sb.append("/resource/noVNC/vnc_lite.html?port=" + ConsoleProxyManager.DEFAULT_NOVNC_PORT + "&token=" + sb.append("/resource/noVNC/vnc.html?port=" + ConsoleProxyManager.DEFAULT_NOVNC_PORT + "&token=" + encryptor.encryptObject(ConsoleProxyClientParam.class, param)); } diff --git a/systemvm/agent/noVNC/.eslintignore b/systemvm/agent/noVNC/.eslintignore deleted file mode 100644 index d38162800ad7..000000000000 --- a/systemvm/agent/noVNC/.eslintignore +++ /dev/null @@ -1 +0,0 @@ -**/xtscancodes.js diff --git a/systemvm/agent/noVNC/.eslintrc b/systemvm/agent/noVNC/.eslintrc deleted file mode 100644 index 900a7186efc4..000000000000 --- a/systemvm/agent/noVNC/.eslintrc +++ /dev/null @@ -1,48 +0,0 @@ -{ - "env": { - "browser": true, - "es6": true - }, - "parserOptions": { - "sourceType": "module" - }, - "extends": "eslint:recommended", - "rules": { - // Unsafe or confusing stuff that we forbid - - "no-unused-vars": ["error", { "vars": "all", "args": "none", "ignoreRestSiblings": true }], - "no-constant-condition": ["error", { "checkLoops": false }], - "no-var": "error", - "no-useless-constructor": "error", - "object-shorthand": ["error", "methods", { "avoidQuotes": true }], - "prefer-arrow-callback": "error", - "arrow-body-style": ["error", "as-needed", { "requireReturnForObjectLiteral": false } ], - "arrow-parens": ["error", "as-needed", { "requireForBlockBody": true }], - "arrow-spacing": ["error"], - "no-confusing-arrow": ["error", { "allowParens": true }], - - // Enforced coding style - - "brace-style": ["error", "1tbs", { "allowSingleLine": true }], - "indent": ["error", 4, { "SwitchCase": 1, - "CallExpression": { "arguments": "first" }, - "ArrayExpression": "first", - "ObjectExpression": "first", - "ignoreComments": true }], - "comma-spacing": ["error"], - "comma-style": ["error"], - "curly": ["error", "multi-line"], - "func-call-spacing": ["error"], - "func-names": ["error"], - "func-style": ["error", "declaration", { "allowArrowFunctions": true }], - "key-spacing": ["error"], - "keyword-spacing": ["error"], - "no-trailing-spaces": ["error"], - "semi": ["error"], - "space-before-blocks": ["error"], - "space-before-function-paren": ["error", { "anonymous": "always", - "named": "never", - "asyncArrow": "always" }], - "switch-colon-spacing": ["error"], - } -} diff --git a/systemvm/agent/noVNC/.github/ISSUE_TEMPLATE/bug_report.md b/systemvm/agent/noVNC/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index 94ac6f8dc6ec..000000000000 --- a/systemvm/agent/noVNC/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,34 +0,0 @@ ---- -name: Bug report -about: Create a report to help us improve - ---- - -**Describe the bug** -A clear and concise description of what the bug is. - -**To Reproduce** -Steps to reproduce the behavior: -1. Go to '...' -2. Click on '....' -3. Scroll down to '....' -4. See error - -**Expected behavior** -A clear and concise description of what you expected to happen. - -**Screenshots** -If applicable, add screenshots to help explain your problem. - -**Client (please complete the following information):** - - OS: [e.g. iOS] - - Browser: [e.g. chrome, safari] - - Browser version: [e.g. 22] - -**Server (please complete the following information):** - - noVNC version: [e.g. 1.0.0 or git commit id] - - VNC server: [e.g. QEMU, TigerVNC] - - WebSocket proxy: [e.g. websockify] - -**Additional context** -Add any other context about the problem here. diff --git a/systemvm/agent/noVNC/.github/ISSUE_TEMPLATE/feature_request.md b/systemvm/agent/noVNC/.github/ISSUE_TEMPLATE/feature_request.md deleted file mode 100644 index 066b2d920a28..000000000000 --- a/systemvm/agent/noVNC/.github/ISSUE_TEMPLATE/feature_request.md +++ /dev/null @@ -1,17 +0,0 @@ ---- -name: Feature request -about: Suggest an idea for this project - ---- - -**Is your feature request related to a problem? Please describe.** -A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] - -**Describe the solution you'd like** -A clear and concise description of what you want to happen. - -**Describe alternatives you've considered** -A clear and concise description of any alternative solutions or features you've considered. - -**Additional context** -Add any other context or screenshots about the feature request here. diff --git a/systemvm/agent/noVNC/.gitignore b/systemvm/agent/noVNC/.gitignore deleted file mode 100644 index c178dbab43d5..000000000000 --- a/systemvm/agent/noVNC/.gitignore +++ /dev/null @@ -1,12 +0,0 @@ -*.pyc -*.o -tests/data_*.js -utils/rebind.so -utils/websockify -/node_modules -/build -/lib -recordings -*.swp -*~ -noVNC-*.tgz diff --git a/systemvm/agent/noVNC/.gitmodules b/systemvm/agent/noVNC/.gitmodules deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/systemvm/agent/noVNC/.travis.yml b/systemvm/agent/noVNC/.travis.yml deleted file mode 100644 index 78b521a80ba7..000000000000 --- a/systemvm/agent/noVNC/.travis.yml +++ /dev/null @@ -1,58 +0,0 @@ -language: node_js -sudo: false -cache: - directories: - - node_modules -node_js: - - 6 -env: - matrix: - - TEST_BROWSER_NAME=chrome TEST_BROWSER_OS='Windows 10' -# FIXME Skip tests in Linux since Sauce Labs browser versions are ancient. -# - TEST_BROWSER_NAME=chrome TEST_BROWSER_OS='Linux' - - TEST_BROWSER_NAME=chrome TEST_BROWSER_OS='OS X 10.11' - - TEST_BROWSER_NAME=firefox TEST_BROWSER_OS='Windows 10' -# - TEST_BROWSER_NAME=firefox TEST_BROWSER_OS='Linux' - - TEST_BROWSER_NAME=firefox TEST_BROWSER_OS='OS X 10.11' - - TEST_BROWSER_NAME='internet explorer' TEST_BROWSER_OS='Windows 10' - - TEST_BROWSER_NAME='internet explorer' TEST_BROWSER_OS='Windows 7' - - TEST_BROWSER_NAME=microsoftedge TEST_BROWSER_OS='Windows 10' - - TEST_BROWSER_NAME=safari TEST_BROWSER_OS='OS X 10.13' -before_script: npm install -g karma-cli -addons: - sauce_connect: - username: "directxman12" - jwt: - secure: "d3ekMYslpn6R4f0ajtRMt9SUFmNGDiItHpqaXC5T4KI0KMEsxgvEOfJot5PiFFJWg1DSpJZH6oaW2UxGZ3duJLZrXIEd/JePY8a6NtT35BNgiDPgcp+eu2Bu3rhrSNg7/HEsD1ma+JeUTnv18Ai5oMFfCCQJx2J6osIxyl/ZVxA=" -stages: -- lint -- test -- name: deploy - if: tag is PRESENT -jobs: - include: - - stage: lint - env: - addons: - before_script: - script: npm run lint - - - env: - addons: - before_script: - script: git ls-tree --name-only -r HEAD | grep -E "[.](html|css)$" | xargs ./utils/validate - - stage: deploy - env: - addons: - script: skip - before_script: skip - deploy: - provider: npm - email: ossman@cendio.se - api_key: - secure: "Qq2Mi9xQawO2zlAigzshzMu2QMHvu1IaN9l0ZIivE99wHJj7eS5f4miJ9wB+/mWRRgb3E8uj9ZRV24+Oc36drlBTU9sz+lHhH0uFMfAIseceK64wZV9sLAZm472fmPp2xdUeTCCqPaRy7g1XBqiJ0LyZvEFLsRijqcLjPBF+b8w=" - on: - tags: true - repo: novnc/noVNC - - diff --git a/systemvm/agent/noVNC/AUTHORS b/systemvm/agent/noVNC/AUTHORS deleted file mode 100644 index dec0e89329a2..000000000000 --- a/systemvm/agent/noVNC/AUTHORS +++ /dev/null @@ -1,13 +0,0 @@ -maintainers: -- Joel Martin (@kanaka) -- Solly Ross (@directxman12) -- Samuel Mannehed for Cendio AB (@samhed) -- Pierre Ossman for Cendio AB (@CendioOssman) -maintainersEmeritus: -- @astrand -contributors: -# There are a bunch of people that should be here. -# If you want to be on this list, feel free send a PR -# to add yourself. -- jalf -- NTT corp. diff --git a/systemvm/agent/noVNC/LICENSE.txt b/systemvm/agent/noVNC/LICENSE.txt deleted file mode 100644 index 20f3eb025fe4..000000000000 --- a/systemvm/agent/noVNC/LICENSE.txt +++ /dev/null @@ -1,68 +0,0 @@ -noVNC is Copyright (C) 2018 The noVNC Authors -(./AUTHORS) - -The noVNC core library files are licensed under the MPL 2.0 (Mozilla -Public License 2.0). The noVNC core library is composed of the -Javascript code necessary for full noVNC operation. This includes (but -is not limited to): - - core/**/*.js - app/*.js - test/playback.js - -The HTML, CSS, font and images files that included with the noVNC -source distibution (or repository) are not considered part of the -noVNC core library and are licensed under more permissive licenses. -The intent is to allow easy integration of noVNC into existing web -sites and web applications. - -The HTML, CSS, font and image files are licensed as follows: - - *.html : 2-Clause BSD license - - app/styles/*.css : 2-Clause BSD license - - app/styles/Orbitron* : SIL Open Font License 1.1 - (Copyright 2009 Matt McInerney) - - app/images/ : Creative Commons Attribution-ShareAlike - http://creativecommons.org/licenses/by-sa/3.0/ - -Some portions of noVNC are copyright to their individual authors. -Please refer to the individual source files and/or to the noVNC commit -history: https://github.com/novnc/noVNC/commits/master - -The are several files and projects that have been incorporated into -the noVNC core library. Here is a list of those files and the original -licenses (all MPL 2.0 compatible): - - core/base64.js : MPL 2.0 - - core/des.js : Various BSD style licenses - - vendor/pako/ : MIT - - vendor/browser-es-module-loader/src/ : MIT - - vendor/browser-es-module-loader/dist/ : Various BSD style licenses - - vendor/promise.js : MIT - -Any other files not mentioned above are typically marked with -a copyright/license header at the top of the file. The default noVNC -license is MPL-2.0. - -The following license texts are included: - - docs/LICENSE.MPL-2.0 - docs/LICENSE.OFL-1.1 - docs/LICENSE.BSD-3-Clause (New BSD) - docs/LICENSE.BSD-2-Clause (Simplified BSD / FreeBSD) - vendor/pako/LICENSE (MIT) - -Or alternatively the license texts may be found here: - - http://www.mozilla.org/MPL/2.0/ - http://scripts.sil.org/OFL - http://en.wikipedia.org/wiki/BSD_licenses - https://opensource.org/licenses/MIT diff --git a/systemvm/agent/noVNC/README.md b/systemvm/agent/noVNC/README.md deleted file mode 100644 index 566b8e4f5afa..000000000000 --- a/systemvm/agent/noVNC/README.md +++ /dev/null @@ -1,152 +0,0 @@ -## noVNC: HTML VNC Client Library and Application - -[![Build Status](https://travis-ci.org/novnc/noVNC.svg?branch=master)](https://travis-ci.org/novnc/noVNC) - -### Description - -noVNC is both a HTML VNC client JavaScript library and an application built on -top of that library. noVNC runs well in any modern browser including mobile -browsers (iOS and Android). - -Many companies, projects and products have integrated noVNC including -[OpenStack](http://www.openstack.org), -[OpenNebula](http://opennebula.org/), -[LibVNCServer](http://libvncserver.sourceforge.net), and -[ThinLinc](https://cendio.com/thinlinc). See -[the Projects and Companies wiki page](https://github.com/novnc/noVNC/wiki/Projects-and-companies-using-noVNC) -for a more complete list with additional info and links. - -### Table of Contents - -- [News/help/contact](#newshelpcontact) -- [Features](#features) -- [Screenshots](#screenshots) -- [Browser Requirements](#browser-requirements) -- [Server Requirements](#server-requirements) -- [Quick Start](#quick-start) -- [Integration and Deployment](#integration-and-deployment) -- [Authors/Contributors](#authorscontributors) - -### News/help/contact - -The project website is found at [novnc.com](http://novnc.com). -Notable commits, announcements and news are posted to -[@noVNC](http://www.twitter.com/noVNC). - -If you are a noVNC developer/integrator/user (or want to be) please join the -[noVNC discussion group](https://groups.google.com/forum/?fromgroups#!forum/novnc). - -Bugs and feature requests can be submitted via -[github issues](https://github.com/novnc/noVNC/issues). If you have questions -about using noVNC then please first use the -[discussion group](https://groups.google.com/forum/?fromgroups#!forum/novnc). -We also have a [wiki](https://github.com/novnc/noVNC/wiki/) with lots of -helpful information. - -If you are looking for a place to start contributing to noVNC, a good place to -start would be the issues that are marked as -["patchwelcome"](https://github.com/novnc/noVNC/issues?labels=patchwelcome). -Please check our -[contribution guide](https://github.com/novnc/noVNC/wiki/Contributing) though. - -If you want to show appreciation for noVNC you could donate to a great non- -profits such as: -[Compassion International](http://www.compassion.com/), -[SIL](http://www.sil.org), -[Habitat for Humanity](http://www.habitat.org), -[Electronic Frontier Foundation](https://www.eff.org/), -[Against Malaria Foundation](http://www.againstmalaria.com/), -[Nothing But Nets](http://www.nothingbutnets.net/), etc. -Please tweet [@noVNC](http://www.twitter.com/noVNC) if you do. - - -### Features - -* Supports all modern browsers including mobile (iOS, Android) -* Supported VNC encodings: raw, copyrect, rre, hextile, tight, tightPNG -* Supports scaling, clipping and resizing the desktop -* Local cursor rendering -* Clipboard copy/paste -* Translations -* Licensed mainly under the [MPL 2.0](http://www.mozilla.org/MPL/2.0/), see - [the license document](LICENSE.txt) for details - -### Screenshots - -Running in Firefox before and after connecting: - -  - - -See more screenshots -[here](http://novnc.com/screenshots.html). - - -### Browser Requirements - -noVNC uses many modern web technologies so a formal requirement list is -not available. However these are the minimum versions we are currently -aware of: - -* Chrome 49, Firefox 44, Safari 10, Opera 36, IE 11, Edge 12 - - -### Server Requirements - -noVNC follows the standard VNC protocol, but unlike other VNC clients it does -require WebSockets support. Many servers include support (e.g. -[x11vnc/libvncserver](http://libvncserver.sourceforge.net/), -[QEMU](http://www.qemu.org/), and -[MobileVNC](http://www.smartlab.at/mobilevnc/)), but for the others you need to -use a WebSockets to TCP socket proxy. noVNC has a sister project -[websockify](https://github.com/novnc/websockify) that provides a simple such -proxy. - - -### Quick Start - -* Use the launch script to automatically download and start websockify, which - includes a mini-webserver and the WebSockets proxy. The `--vnc` option is - used to specify the location of a running VNC server: - - `./utils/launch.sh --vnc localhost:5901` - -* Point your browser to the cut-and-paste URL that is output by the launch - script. Hit the Connect button, enter a password if the VNC server has one - configured, and enjoy! - - -### Integration and Deployment - -Please see our other documents for how to integrate noVNC in your own software, -or deploying the noVNC application in production environments: - -* [Embedding](docs/EMBEDDING.md) - For the noVNC application -* [Library](docs/LIBRARY.md) - For the noVNC JavaScript library - - -### Authors/Contributors - -See [AUTHORS](AUTHORS) for a (full-ish) list of authors. If you're not on -that list and you think you should be, feel free to send a PR to fix that. - -* Core team: - * [Joel Martin](https://github.com/kanaka) - * [Samuel Mannehed](https://github.com/samhed) (Cendio) - * [Peter Åstrand](https://github.com/astrand) (Cendio) - * [Solly Ross](https://github.com/DirectXMan12) (Red Hat / OpenStack) - * [Pierre Ossman](https://github.com/CendioOssman) (Cendio) - -* Notable contributions: - * UI and Icons : Pierre Ossman, Chris Gordon - * Original Logo : Michael Sersen - * tight encoding : Michael Tinglof (Mercuri.ca) - -* Included libraries: - * base64 : Martijn Pieters (Digital Creations 2), Samuel Sieb (sieb.net) - * DES : Dave Zimmerman (Widget Workshop), Jef Poskanzer (ACME Labs) - * Pako : Vitaly Puzrin (https://github.com/nodeca/pako) - -Do you want to be on this list? Check out our -[contribution guide](https://github.com/novnc/noVNC/wiki/Contributing) and -start hacking! diff --git a/systemvm/agent/noVNC/VERSION b/systemvm/agent/noVNC/VERSION deleted file mode 100644 index 9084fa2f716a..000000000000 --- a/systemvm/agent/noVNC/VERSION +++ /dev/null @@ -1 +0,0 @@ -1.1.0 diff --git a/systemvm/agent/noVNC/app/error-handler.js b/systemvm/agent/noVNC/app/error-handler.js index 8e294166fc65..81a6cba8e6e3 100644 --- a/systemvm/agent/noVNC/app/error-handler.js +++ b/systemvm/agent/noVNC/app/error-handler.js @@ -1,3 +1,11 @@ +/* + * noVNC: HTML5 VNC client + * Copyright (C) 2019 The noVNC Authors + * Licensed under MPL 2.0 (see LICENSE.txt) + * + * See README.md for usage and integration instructions. + */ + // NB: this should *not* be included as a module until we have // native support in the browsers, so that our error handler // can catch script-loading errors. diff --git a/systemvm/agent/noVNC/app/images/alt.png b/systemvm/agent/noVNC/app/images/alt.png new file mode 100644 index 0000000000000000000000000000000000000000..2d5e35e7fb8987bab62b8c40ee193f6844ad1fad GIT binary patch literal 335 zcmV-V0kHmwP)P000>X1^@s6#OZ}&00006VoOIv0RI60 z0RN!9r;`8x0R%}zK~zYI?UFr81VIo+U+)YCqQMG+-~}`g1!E0F5W&d6&=dsNfV(9rNNs4MEmUxi)R=Pc`= zt55Mfr*_r--w2jMP(_{3C2Fa5;`^z(thRq5IgXzXqaJ-DnRb|+x`I-@SFhDV?ZqlG zNmAD%{6uZ5V|iX{gl7|&0eZk5a0|==YhO2|lmuSlwMr>Hrj*|EuyTZ?6LmG#fL)-Q z?Hz - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff --git a/systemvm/agent/noVNC/app/images/clipboard.png b/systemvm/agent/noVNC/app/images/clipboard.png new file mode 100644 index 0000000000000000000000000000000000000000..d7fe507eb797134d5cbddbad5cf1908a62f2d954 GIT binary patch literal 220 zcmeAS@N?(olHy`uVBq!ia0vp^k|4~%1|*NXY)uAIY)RhkE)4%caKYZ?lYt@=JzX3_ zJUZV_I4J61AmE}tkL`}Aid11pmsBTPhymY@3h7PS>VJ~&z592D!QN8w=A=2A!XCe5 zCJ6}2_}r|Mn>lsTR!yOevs^r*HhsR>vg_E5b#9OJU4&0Q+vwt)vwefi<)C}K6W%a} zh%0v&=LJOChfd!o_wYseE2|CHzpdJp#<10tx1peJ!laVjC$wJl?6#NIjwnpn^-1JM Q2+(m1p00i_>zopr0A);7eE - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff --git a/systemvm/agent/noVNC/app/images/connect.png b/systemvm/agent/noVNC/app/images/connect.png new file mode 100644 index 0000000000000000000000000000000000000000..abdbe420d5c9a02624bb67bf57eadd4956863391 GIT binary patch literal 424 zcmV;Z0ayNsP)P000>X1^@s6#OZ}&00006VoOIv0RI60 z0RN!9r;`8x0bNN%K~zYI?UcVt13?gnXM}V%5Ur92PFQy`;=^``exQ_GW&2BI}3XqmnPyoPQvz{K=!EWo>{2yo;817Pt32QI=P&jGX?pkEfyw4P4Ai+~3!Gy)Q* zccK86bZSYxKpz74Il#W)4A?aHl@Fk8kTFm%IOB&L2e1M)vKI^43$6$I9?*{lxIzi= z=0Mw~$Gd0&s9`S3Th}u)#0|M5C~qC+x^5M~+yt_}>4{|jq8n9xta#^jl#f3_0%XJp S6q$|y0000 - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff --git a/systemvm/agent/noVNC/app/images/ctrl.png b/systemvm/agent/noVNC/app/images/ctrl.png new file mode 100644 index 0000000000000000000000000000000000000000..fbc9e1314ecf42b5a0d696d8c1ec94a3bc5f858b GIT binary patch literal 399 zcmV;A0dW3_P)P000>X1^@s6#OZ}&00006VoOIv0RI60 z0RN!9r;`8x0YpheK~zYI?UKDpTu~H8*Pa;^9U+J#lCenPm_i#tThRxw@dc7PwW$L_ zx;%keSzDw?;}eK~l_Vh82o8o2(*Uq`p-LA2L+bPwKVzoU7yNoO-Oj>rrGU?W_IMDml+O@E+I$J^*cC1sDdF zfqCFmJp)dFF<=rn0v3Q~KT(@%TYZ_+>vpoLZl(8w^jzzfq?9>mD0THCBEDyfM8qYq zn3f;oj?Wp(J}?e!cWeItbw$LD`U|M3BN6etXY_kEBjPGG+wn2~=X?PMfDLs*9aZ0? z=&j_btNB^B=oj^cx|_TEKWQda^&+FsWM - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - diff --git a/systemvm/agent/noVNC/app/images/ctrlaltdel.png b/systemvm/agent/noVNC/app/images/ctrlaltdel.png new file mode 100644 index 0000000000000000000000000000000000000000..dd0497819d4081c2fd2021e461152ee3acc89ee6 GIT binary patch literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^k|4~%1|*NXY)uAIY)RhkE)4%caKYZ?lYt^7o-U3d z9-VKe1adVf2(aGun|}8{%PZSu`vU?hma?{e-l=`=_#un!Ke!$+2&oEwP*$C2rC6Un zS18Kbc=x}1RVrG+9zn@+QlEb_>?``i@aC{e_xuH0R_qS<>b?^9ROD??)RJ#n>0N7V mCTZxtdOh{hqN}T~TQa)5XZ+}+(X$q4KZB>MpUXO@geCx?yGs`U literal 0 HcmV?d00001 diff --git a/systemvm/agent/noVNC/app/images/ctrlaltdel.svg b/systemvm/agent/noVNC/app/images/ctrlaltdel.svg deleted file mode 100644 index d7744ea31da6..000000000000 --- a/systemvm/agent/noVNC/app/images/ctrlaltdel.svg +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/systemvm/agent/noVNC/app/images/disconnect.png b/systemvm/agent/noVNC/app/images/disconnect.png new file mode 100644 index 0000000000000000000000000000000000000000..97eb1a98821455285cbbfcf2263d05d4bd90ad88 GIT binary patch literal 442 zcmV;r0Y(0aP)P000>X1^@s6#OZ}&00006VoOIv0RI60 z0RN!9r;`8x0dGk}K~zYI?UcPr13?hSXTgAdL{bO=pFvXDYwT?FH6j)^_7V&8QTYl{ zlgh?c5d&g~Af~kP84L*dS=^jAS?-csO__hUb35~!kDU`)DnRb9jzC33wngMqM0(D- z?}cRrIG_$pNHhRSiv+YZ@EEuN-t{~R0s)&q8(8t|O#`T^tq2T*KtLJzP^TN9V7}FW zuNYwL7BsLvS&&nvb!968${Bt|)4GE^)tq^to>$Q-a1Y#iehs~UG#8QqN^9MtIahU7 z6JRS3z?mUib^VGw06;wyFa|mvsPBQwM2`WY=RJSHi54ve?5VBgfzn#n%nPV!Pk#Yw z@29lxnt4w(19GeZ8lL?QcuJ|L8w>&t)p-Q0W!&*+6jl*X0AAF2=!1Y=Gvt4P)`2&5 zevLuEjsaYfEMBZmuE85niRr& - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - diff --git a/systemvm/agent/noVNC/app/images/drag.png b/systemvm/agent/noVNC/app/images/drag.png new file mode 100644 index 0000000000000000000000000000000000000000..f006202a793980e6e0a680c6f0a7e19fb925e25b GIT binary patch literal 336 zcmV-W0k8gvP)P000>X1^@s6#OZ}&00006VoOIv0RI60 z0RN!9r;`8x0R>4!K~zYI?UKz(!%z@~&y;py-T4MSoev-)xN_rC+_@27&As)f*lHp* z>F2^5oQ$C)Aq0dT2;|J%d%j5+X|I1R;0jm(XG4Zw0FS_F@^Ad;X)q|T4xyXm*U7I! zzcy4`NEP}HO!-v?7*Hm^3PUY?&Lo6h0?#SbB+XLmK+<8DVealvUCsN($+I-cCorR~ zd-q-fcg`2#OJ8?E3U~0BZt~}A5DSoPto78=%#JEE3C-;QfIo_muQ4E-F(5BvK&}VM zEp~Q+6X2oa`g-NSxzB7|S754sOOTt{JQm~cs#Hp%2c+>%BgD**^w9&7w}vF$N?N8T iYXQh4-E^O8ub^+!{gO$_{R*D|0000 - - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/systemvm/agent/noVNC/app/images/error.png b/systemvm/agent/noVNC/app/images/error.png new file mode 100644 index 0000000000000000000000000000000000000000..04e78e1a4eea7cbcdef551a797439d0a735b96f0 GIT binary patch literal 348 zcmV-i0i*tjP)P000>X1^@s6#OZ}&00006VoOIv0RI60 z0RN!9r;`8x0TD?=K~zYI?bR_(LO~RTVIr-G7HTZ)(FRC#1!|P-X)N6Uh2UOnOx%GG z5jOByIK?o$H@pE#PB-`5-2a`Mmzh>;uWf`&ykntE3yjfe0+0DTit6(mB-VLU?^b{&=tez9vDp-Imv}K~2@w4IO&~MeB>ojXDgeCz zE{4Dq{iNq0Irl@~l1dDc}~nc|`r5`jjT7Y?6exE8S2I{g7zj(E>=k2IbD0000 - - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/systemvm/agent/noVNC/app/images/esc.png b/systemvm/agent/noVNC/app/images/esc.png new file mode 100644 index 0000000000000000000000000000000000000000..e1b1bfa2a9c81d7842bd87126eda3d17efd06e95 GIT binary patch literal 365 zcmV-z0h0cSP)P000>X1^@s6#OZ}&00006VoOIv0RI60 z0RN!9r;`8x0U}96K~zYI?UTPNMqw1kKL;fwUcd4q8Eq^^Ww$7s_#58%7c6FffYEAD zl-XnulR+tlx0GTqi14u-b$h+HS25mCo$mdfbDneVd7kG&MMXtBqA1i(VBtqn#M!@f zRBN`T<1cl)O8nQr#_^0VyGa`AX4-njwla32 z9;uD=&#I5=i+ZZwtF_Xxnzrjb?L1?!9 z9;cott6O%UgX&trdVyh}9ucF!4loJK1LwJ>u8ycnYR_-CtH`vvo$qh?yifo)%<0SvY1|CBdu4449*ft!f1uy!n`yNigY(n%^RDq8XdO^!VX|2iCn00000 LNkvXXu0mjff7z$1 literal 0 HcmV?d00001 diff --git a/systemvm/agent/noVNC/app/images/esc.svg b/systemvm/agent/noVNC/app/images/esc.svg deleted file mode 100644 index 830152b5f930..000000000000 --- a/systemvm/agent/noVNC/app/images/esc.svg +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - diff --git a/systemvm/agent/noVNC/app/images/expander.png b/systemvm/agent/noVNC/app/images/expander.png new file mode 100644 index 0000000000000000000000000000000000000000..27937219e9b7527c40fe7c13fdb5d024f1e08807 GIT binary patch literal 167 zcmeAS@N?(olHy`uVBq!ia0vp^oIuRQ!3HGLSWET+DYhhUcNd2LAh=-f^2tDv7*7|+ z5Q(Y17j|4wwEHjo@Vsvc6?<@ll^z6mP!l`W;)-H&6MM#kyl9pDdm+CSBE==NIz16lf2F Mr>mdKI;Vst0Oy4{XaE2J literal 0 HcmV?d00001 diff --git a/systemvm/agent/noVNC/app/images/expander.svg b/systemvm/agent/noVNC/app/images/expander.svg deleted file mode 100644 index e1635358be9c..000000000000 --- a/systemvm/agent/noVNC/app/images/expander.svg +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/systemvm/agent/noVNC/app/images/fullscreen.png b/systemvm/agent/noVNC/app/images/fullscreen.png new file mode 100644 index 0000000000000000000000000000000000000000..a7f26344292c7481cca2466862247ddfe763d73d GIT binary patch literal 280 zcmeAS@N?(olHy`uVBq!ia0vp^k|4~&3?$8t&j;>za+>n zm_bI?Vd=8v+nzpq{pRzRuP&xne*vW!lf2zs_$78R+yru}JzX3_BrYc>C@^-M{m;*| zmPvu{^1uHA8w8Ie|K<}*5%|xgWNGJUV(^z?;vabjr~m&A{ukRv)XB~iAh-Nul8W5_-S%XlXEKa-MV;Gg3P ixA>oJ;g}$lz)=6s=ftzDwg#Xx7(8A5T-G@yGywnxREI|Z literal 0 HcmV?d00001 diff --git a/systemvm/agent/noVNC/app/images/fullscreen.svg b/systemvm/agent/noVNC/app/images/fullscreen.svg deleted file mode 100644 index 29bd05da14dd..000000000000 --- a/systemvm/agent/noVNC/app/images/fullscreen.svg +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/systemvm/agent/noVNC/app/images/handle.png b/systemvm/agent/noVNC/app/images/handle.png new file mode 100644 index 0000000000000000000000000000000000000000..cf0e5d55f1c2b7760f1a6be03f71327a95c2f19e GIT binary patch literal 126 zcmeAS@N?(olHy`uVBq!ia0vp^tU%1h!3HF`e}{O3I7!~_E)4%caKYZ?lYt_}o-U3d z95Zvz8gd;_5MezizWUAy<7Y8u*DU)DRyJ|e|4MCc6t}g%eW>|&)0{N#rKf^>?Sjkg V-E6!oF9EePc)I$ztaD0e0sv#GD5L-Y literal 0 HcmV?d00001 diff --git a/systemvm/agent/noVNC/app/images/handle.svg b/systemvm/agent/noVNC/app/images/handle.svg deleted file mode 100644 index 4a7a126f9d3b..000000000000 --- a/systemvm/agent/noVNC/app/images/handle.svg +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/systemvm/agent/noVNC/app/images/handle_bg.png b/systemvm/agent/noVNC/app/images/handle_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..efb0357ac8207a1fb2a8dbe6343f86b7504908a5 GIT binary patch literal 123 zcmeAS@N?(olHy`uVBq!ia0vp^{6K8P$P6TR{t>PMQfvV}A+A9B|Ns9>Z_d99WHFTl z`2{oB>iuri1o9Y@yxmVDFymmY QEl>f2r>mdKI;Vst0OpM!Q~&?~ literal 0 HcmV?d00001 diff --git a/systemvm/agent/noVNC/app/images/handle_bg.svg b/systemvm/agent/noVNC/app/images/handle_bg.svg deleted file mode 100644 index 7579c42cb78c..000000000000 --- a/systemvm/agent/noVNC/app/images/handle_bg.svg +++ /dev/null @@ -1,172 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - diff --git a/systemvm/agent/noVNC/app/images/info.png b/systemvm/agent/noVNC/app/images/info.png new file mode 100644 index 0000000000000000000000000000000000000000..21e358981afb8fac64a4f2918081b440af3c4d61 GIT binary patch literal 448 zcmV;x0YCnUP)P000>X1^@s6#OZ}&00006VoOIv0RI60 z0RN!9r;`8x0d+}4K~zYI?Ug%D!$1^8?~5Rb1Qh&IAcZEd5F{$tK~@1JVFLuEL9BrV zAQ4d`6v76m_%t9Sq)>-IltW<$IhJQ^qm;Sbc&_Kn_4vJ!X38N;GXR^C>XP;))g-M- z>PdQ$)RuH%X0QLE17)BEeBoCgI0edi0TtjrVZkF{0ca%5b%9Er1W5pZ#n7|ln7;!` zSs*RXr)dC-z_G{EOap9^egQC zd~?9iljg>kq~_os0t@4TnGGe4JZZL~gNb4U29k=Nmy2fh6MDZT%{zPpGyAKXc#=;K zAdh;{K^*ctCCJ1&aY%bgkSpg5P!0ccmsTR)4d5YnorK-=+_S^oi1%I6WrF7{wJQ_! zuC61=2e1PafNkI@Hs2vj?+QT`f@bH^DB)QLSkDBAfJ#6U{~3+X;KY|8%gtC-(2MpI qRPvgFI(U?Ht>9*S%avdzpMC+3!GJ)>)}Ign0000 - - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/systemvm/agent/noVNC/app/images/keyboard.png b/systemvm/agent/noVNC/app/images/keyboard.png new file mode 100644 index 0000000000000000000000000000000000000000..fe8056bda1eb50aca75d5c233ada77b8b0290450 GIT binary patch literal 308 zcmV-40n7f0P)P000>X1^@s6#OZ}&00006VoOIv0RI60 z0RN!9r;`8x0O?6YK~zYI?Uk_#!Y~kqFCzF5N;jXtQ3suUslJYglaoGB7ZF5os1BdY zRWxnRCM~%5ElKE~`*OEb - - - - - - - - - - - image/svg+xml - - - - - - - - - - diff --git a/systemvm/agent/noVNC/app/images/mouse_left.svg b/systemvm/agent/noVNC/app/images/mouse_left.svg deleted file mode 100644 index ce4cca41c790..000000000000 --- a/systemvm/agent/noVNC/app/images/mouse_left.svg +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - diff --git a/systemvm/agent/noVNC/app/images/mouse_middle.svg b/systemvm/agent/noVNC/app/images/mouse_middle.svg deleted file mode 100644 index 6603425cb3e7..000000000000 --- a/systemvm/agent/noVNC/app/images/mouse_middle.svg +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - diff --git a/systemvm/agent/noVNC/app/images/mouse_none.svg b/systemvm/agent/noVNC/app/images/mouse_none.svg deleted file mode 100644 index 3e0f838a77af..000000000000 --- a/systemvm/agent/noVNC/app/images/mouse_none.svg +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - diff --git a/systemvm/agent/noVNC/app/images/mouse_right.svg b/systemvm/agent/noVNC/app/images/mouse_right.svg deleted file mode 100644 index f4bad76797cb..000000000000 --- a/systemvm/agent/noVNC/app/images/mouse_right.svg +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - diff --git a/systemvm/agent/noVNC/app/images/power.png b/systemvm/agent/noVNC/app/images/power.png new file mode 100644 index 0000000000000000000000000000000000000000..7f871358d1f5b2009a011672624608d4c927498a GIT binary patch literal 421 zcmV;W0b2fvP)P000>X1^@s6#OZ}&00006VoOIv0RI60 z0RN!9r;`8x0a{5!K~zYI?bN+W9Z?j;@i~#0UW=$Cpur}2frN;?U@hq)`U<{*eF&n@ z5HYDEc?~U8{AdI#3&rNDSNx@LU%8x&_nwK^xtf8!_S*l$*)vmB&w46h8K+o&O30Nv zT{X$2h7k9`l!~)23I@M=jNcc6sj8}W`pnqD=YF7v0JEJPbk**a)h;pJ6z~ogF<`Y1 zWGzakm}mm|6~Uib{U1oyzflSp!40l4l6gll>?o^`Mt>WxOCVoj&}NM{i6u?70U|ho^9X*&zyo~)Sc$$fj2A; - - - - - - - - - - - image/svg+xml - - - - - - - - - - diff --git a/systemvm/agent/noVNC/app/images/settings.png b/systemvm/agent/noVNC/app/images/settings.png new file mode 100644 index 0000000000000000000000000000000000000000..8d0c0d4e8658ebc8ce743fa89d8a532154d94d23 GIT binary patch literal 379 zcmV->0fhdEP)P000>X1^@s6#OZ}&00006VoOIv0RI60 z0RN!9r;`8x0We8KK~zYI?Ug-J0znXk-@t}Yr5gxGAu~`sfEHMKEkp1MDmO6m1{;eJ zm}pt%pUEQQ?Ckt(V8n~&=XJlH?&==tfDD)%GQh8)G0C>QfWs1Ky?3}hpiC9r8I6Go zxCaX08hGR{R=^zS*SrcCrwWv{!46x(*jVez_aa|9J|sO``;$mqBWwL4=`-~;g%e>4 zHbCL?*H+joC&CnrBwgl++U81rp$ zhmyY9$ab?PHCv5IWS<9`jR){rr)U6N0BaBDDMw@;sZSebIU-&Ar0?_Bs0m;s-Kkrj zEbt6fU*V4>om%^C#QD3mo=7@M3W@y`Ub3IUDF?a*b-{|C$@rf9{f-K - - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/systemvm/agent/noVNC/app/images/tab.png b/systemvm/agent/noVNC/app/images/tab.png new file mode 100644 index 0000000000000000000000000000000000000000..6adb7819d1ebcd2283d500da271208b55ecee7f0 GIT binary patch literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^k|4~&3?$8t&jBc!h{WaO1O@R8Yz7hvpJy;ns9bhp&w~IB zhR;la6^x5Cen~JF+-wlFFlbTw=oC<~kWWB*!8X>#ADRL}v=lx!1^5^`Je - - - - - - - - - - - image/svg+xml - - - - - - - - - - diff --git a/systemvm/agent/noVNC/app/images/toggleextrakeys.png b/systemvm/agent/noVNC/app/images/toggleextrakeys.png new file mode 100644 index 0000000000000000000000000000000000000000..0f80f6d5ba3f3026a07e8424a9ecc376ef6429b7 GIT binary patch literal 353 zcmV-n0iOPeP)P000>X1^@s6#OZ}&00006VoOIv0RI60 z0RN!9r;`8x0TxL_K~zYI?UX%E!$1&5-y%^!f#~A`8Nw|%3ONOb;R;bi1sybS0w@tZ z6_MhI66H~35te1+aVQW{UNiFSeEZG*cwx)GKrPgnx-`a8y;8?R4CcYfo6OZw#AKEQ z*CD}LGs^X<(}>_}i$Vr9U6FN*NU^FNV-I=weyBE7sFvzVeb2FsYIk~FznK6DxXAH5 zDokzN0Hl;sEti0o{5b}mfnA_XDfyEY;ww1=j)4#05?BF8Ip0gvWRl}6Q07?A52JZ_ z>Yln#9~*T~YNhUXX?so7VqkN{CMHAv_(HwuGHJVA6>t!lyn`yGbXZTc9sJ!d3;=F> zE7Vi<&CQsrC!tnczpB%Gdm>b>U+ - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - diff --git a/systemvm/agent/noVNC/app/images/warning.png b/systemvm/agent/noVNC/app/images/warning.png new file mode 100644 index 0000000000000000000000000000000000000000..e9dd550c13227cd34042d1f7b6a9c7c2967a2337 GIT binary patch literal 319 zcmV-F0l@x=P)P000>X1^@s6#OZ}&00006VoOIv0RI60 z0RN!9r;`8x0Q5;jK~zYI?UXxi!ax*7uTxl{I2OtVkXT%3qNIp~lmylU8^W*wi!SX+ zGnSl(=Yv00xXoyO@A~Mzv2@oI0_MO0_yP97dYxB-?XfqFkHYB-DBRekw08sSJOxq}em4;cfKT8tKoY0n`cG?B zxN}dvX@Dwnxyj@^a_-o!n;Da{q-8X?xK3G?t(u8#;TK8OK!ZxsdSH$JtY6w*R%McK REiZlQK literal 0 HcmV?d00001 diff --git a/systemvm/agent/noVNC/app/images/warning.svg b/systemvm/agent/noVNC/app/images/warning.svg deleted file mode 100644 index 7114f9b1235b..000000000000 --- a/systemvm/agent/noVNC/app/images/warning.svg +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/systemvm/agent/noVNC/app/images/windows.png b/systemvm/agent/noVNC/app/images/windows.png new file mode 100644 index 0000000000000000000000000000000000000000..036e1ae1130dc7c943f1f783ec177e396905047f GIT binary patch literal 219 zcmeAS@N?(olHy`uVBq!ia0vp^k|4~%1|*NXY)uAIY)RhkE)4%caKYZ?lYt@=JY5_^ zJUZV_J#LUxAdgtyEF zPl}m#ImxTYdjDTGDS`jX0oD7q6I5bz?-w2NyrZtBzwzy=#Y@V!&B|Z-{#nVEDH@yh zDykM1>C+>c@(OIZKZ&t-RcF(tW_8i>R6Y^K_@Z*`m RDnPd}c)I$ztaD0e0sv%1T*d$Z literal 0 HcmV?d00001 diff --git a/systemvm/agent/noVNC/app/images/windows.svg b/systemvm/agent/noVNC/app/images/windows.svg deleted file mode 100644 index 270405c7ff2a..000000000000 --- a/systemvm/agent/noVNC/app/images/windows.svg +++ /dev/null @@ -1,85 +0,0 @@ - - - -image/svg+xml - - - - - - - - - - \ No newline at end of file diff --git a/systemvm/agent/noVNC/app/locale/README b/systemvm/agent/noVNC/app/locale/README new file mode 100644 index 000000000000..ca4f548bcbeb --- /dev/null +++ b/systemvm/agent/noVNC/app/locale/README @@ -0,0 +1 @@ +DO NOT MODIFY THE FILES IN THIS FOLDER, THEY ARE AUTOMATICALLY GENERATED FROM THE PO-FILES. diff --git a/systemvm/agent/noVNC/app/locale/ja.json b/systemvm/agent/noVNC/app/locale/ja.json new file mode 100644 index 000000000000..e5fe3401fcb1 --- /dev/null +++ b/systemvm/agent/noVNC/app/locale/ja.json @@ -0,0 +1,73 @@ +{ + "Connecting...": "接続しています...", + "Disconnecting...": "切断しています...", + "Reconnecting...": "再接続しています...", + "Internal error": "内部エラー", + "Must set host": "ホストを設定する必要があります", + "Connected (encrypted) to ": "接続しました (暗号化済み): ", + "Connected (unencrypted) to ": "接続しました (暗号化されていません): ", + "Something went wrong, connection is closed": "何かが問題で、接続が閉じられました", + "Failed to connect to server": "サーバーへの接続に失敗しました", + "Disconnected": "切断しました", + "New connection has been rejected with reason: ": "新規接続は次の理由で拒否されました: ", + "New connection has been rejected": "新規接続は拒否されました", + "Password is required": "パスワードが必要です", + "noVNC encountered an error:": "noVNC でエラーが発生しました:", + "Hide/Show the control bar": "コントロールバーを隠す/表示する", + "Move/Drag Viewport": "ビューポートを移動/ドラッグ", + "viewport drag": "ビューポートをドラッグ", + "Active Mouse Button": "アクティブなマウスボタン", + "No mousebutton": "マウスボタンなし", + "Left mousebutton": "左マウスボタン", + "Middle mousebutton": "中マウスボタン", + "Right mousebutton": "右マウスボタン", + "Keyboard": "キーボード", + "Show Keyboard": "キーボードを表示", + "Extra keys": "追加キー", + "Show Extra Keys": "追加キーを表示", + "Ctrl": "Ctrl", + "Toggle Ctrl": "Ctrl キーを切り替え", + "Alt": "Alt", + "Toggle Alt": "Alt キーを切り替え", + "Toggle Windows": "Windows キーを切り替え", + "Windows": "Windows", + "Send Tab": "Tab キーを送信", + "Tab": "Tab", + "Esc": "Esc", + "Send Escape": "Escape キーを送信", + "Ctrl+Alt+Del": "Ctrl+Alt+Del", + "Send Ctrl-Alt-Del": "Ctrl-Alt-Del を送信", + "Shutdown/Reboot": "シャットダウン/再起動", + "Shutdown/Reboot...": "シャットダウン/再起動...", + "Power": "電源", + "Shutdown": "シャットダウン", + "Reboot": "再起動", + "Reset": "リセット", + "Clipboard": "クリップボード", + "Clear": "クリア", + "Fullscreen": "全画面表示", + "Settings": "設定", + "Shared Mode": "共有モード", + "View Only": "表示のみ", + "Clip to Window": "ウィンドウにクリップ", + "Scaling Mode:": "スケーリングモード:", + "None": "なし", + "Local Scaling": "ローカルスケーリング", + "Remote Resizing": "リモートでリサイズ", + "Advanced": "高度", + "Repeater ID:": "リピーター ID:", + "WebSocket": "WebSocket", + "Encrypt": "暗号化", + "Host:": "ホスト:", + "Port:": "ポート:", + "Path:": "パス:", + "Automatic Reconnect": "自動再接続", + "Reconnect Delay (ms):": "再接続する遅延 (ミリ秒):", + "Show Dot when No Cursor": "カーソルがないときにドットを表示", + "Logging:": "ロギング:", + "Disconnect": "切断", + "Connect": "接続", + "Password:": "パスワード:", + "Send Password": "パスワードを送信", + "Cancel": "キャンセル" +} \ No newline at end of file diff --git a/systemvm/agent/noVNC/app/locale/sv.json b/systemvm/agent/noVNC/app/locale/sv.json index d49ea540d931..e46df45b5851 100644 --- a/systemvm/agent/noVNC/app/locale/sv.json +++ b/systemvm/agent/noVNC/app/locale/sv.json @@ -11,16 +11,11 @@ "Disconnected": "Frånkopplad", "New connection has been rejected with reason: ": "Ny anslutning har blivit nekad med följande skäl: ", "New connection has been rejected": "Ny anslutning har blivit nekad", - "Password is required": "Lösenord krävs", + "Credentials are required": "Användaruppgifter krävs", "noVNC encountered an error:": "noVNC stötte på ett problem:", "Hide/Show the control bar": "Göm/Visa kontrollbaren", + "Drag": "Dra", "Move/Drag Viewport": "Flytta/Dra Vyn", - "viewport drag": "dra vy", - "Active Mouse Button": "Aktiv musknapp", - "No mousebutton": "Ingen musknapp", - "Left mousebutton": "Vänster musknapp", - "Middle mousebutton": "Mitten-musknapp", - "Right mousebutton": "Höger musknapp", "Keyboard": "Tangentbord", "Show Keyboard": "Visa Tangentbord", "Extra keys": "Extraknappar", @@ -55,6 +50,8 @@ "Local Scaling": "Lokal Skalning", "Remote Resizing": "Ändra Storlek", "Advanced": "Avancerat", + "Quality:": "Kvalitet:", + "Compression level:": "Kompressionsnivå:", "Repeater ID:": "Repeater-ID:", "WebSocket": "WebSocket", "Encrypt": "Kryptera", @@ -65,9 +62,11 @@ "Reconnect Delay (ms):": "Fördröjning (ms):", "Show Dot when No Cursor": "Visa prick när ingen muspekare finns", "Logging:": "Loggning:", + "Version:": "Version:", "Disconnect": "Koppla från", "Connect": "Anslut", + "Username:": "Användarnamn:", "Password:": "Lösenord:", - "Send Password": "Skicka lösenord", + "Send Credentials": "Skicka Användaruppgifter", "Cancel": "Avbryt" } \ No newline at end of file diff --git a/systemvm/agent/noVNC/app/locale/zh_CN.json b/systemvm/agent/noVNC/app/locale/zh_CN.json index b66995620ff2..f0aea9af3e11 100644 --- a/systemvm/agent/noVNC/app/locale/zh_CN.json +++ b/systemvm/agent/noVNC/app/locale/zh_CN.json @@ -1,19 +1,19 @@ { - "Connecting...": "链接中...", - "Disconnecting...": "正在中断连接...", - "Reconnecting...": "重新链接中...", + "Connecting...": "连接中...", + "Disconnecting...": "正在断开连接...", + "Reconnecting...": "重新连接中...", "Internal error": "内部错误", "Must set host": "请提供主机名", - "Connected (encrypted) to ": "已加密链接到", - "Connected (unencrypted) to ": "未加密链接到", - "Something went wrong, connection is closed": "发生错误，链接已关闭", - "Failed to connect to server": "无法链接到服务器", - "Disconnected": "链接已中断", - "New connection has been rejected with reason: ": "链接被拒绝，原因：", - "New connection has been rejected": "链接被拒绝", + "Connected (encrypted) to ": "已连接到（加密）", + "Connected (unencrypted) to ": "已连接到（未加密）", + "Something went wrong, connection is closed": "发生错误，连接已关闭", + "Failed to connect to server": "无法连接到服务器", + "Disconnected": "已断开连接", + "New connection has been rejected with reason: ": "连接被拒绝，原因：", + "New connection has been rejected": "连接被拒绝", "Password is required": "请提供密码", "noVNC encountered an error:": "noVNC 遇到一个错误：", - "Hide/Show the control bar": "显示/隐藏控制列", + "Hide/Show the control bar": "显示/隐藏控制栏", "Move/Drag Viewport": "拖放显示范围", "viewport drag": "显示范围拖放", "Active Mouse Button": "启动鼠标按鍵", @@ -43,10 +43,10 @@ "Reset": "重置", "Clipboard": "剪贴板", "Clear": "清除", - "Fullscreen": "全屏幕", + "Fullscreen": "全屏", "Settings": "设置", "Shared Mode": "分享模式", - "View Only": "仅检视", + "View Only": "仅查看", "Clip to Window": "限制/裁切窗口大小", "Scaling Mode:": "缩放模式：", "None": "无", @@ -59,11 +59,11 @@ "Host:": "主机：", "Port:": "端口：", "Path:": "路径：", - "Automatic Reconnect": "自动重新链接", - "Reconnect Delay (ms):": "重新链接间隔 (ms)：", + "Automatic Reconnect": "自动重新连接", + "Reconnect Delay (ms):": "重新连接间隔 (ms)：", "Logging:": "日志级别：", - "Disconnect": "终端链接", - "Connect": "链接", + "Disconnect": "中断连接", + "Connect": "连接", "Password:": "密码：", "Cancel": "取消" } \ No newline at end of file diff --git a/systemvm/agent/noVNC/app/styles/base.css b/systemvm/agent/noVNC/app/styles/base.css index 3ca9894dc742..fd78b79c772d 100644 --- a/systemvm/agent/noVNC/app/styles/base.css +++ b/systemvm/agent/noVNC/app/styles/base.css @@ -1,6 +1,6 @@ /* * noVNC base CSS - * Copyright (C) 2018 The noVNC Authors + * Copyright (C) 2019 The noVNC Authors * noVNC is licensed under the MPL 2.0 (see LICENSE.txt) * This file is licensed under the 2-Clause BSD license (see LICENSE.txt). */ @@ -83,8 +83,20 @@ html { * ---------------------------------------- */ -input[type=input], input[type=password], input[type=number], -input:not([type]), textarea { +input:not([type]), +input[type=date], +input[type=datetime-local], +input[type=email], +input[type=month], +input[type=number], +input[type=password], +input[type=search], +input[type=tel], +input[type=text], +input[type=time], +input[type=url], +input[type=week], +textarea { /* Disable default rendering */ -webkit-appearance: none; -moz-appearance: none; @@ -98,7 +110,11 @@ input:not([type]), textarea { background: linear-gradient(to top, rgb(255, 255, 255) 80%, rgb(240, 240, 240)); } -input[type=button], input[type=submit], select { +input[type=button], +input[type=color], +input[type=reset], +input[type=submit], +select { /* Disable default rendering */ -webkit-appearance: none; -moz-appearance: none; @@ -116,7 +132,10 @@ input[type=button], input[type=submit], select { vertical-align: middle; } -input[type=button], input[type=submit] { +input[type=button], +input[type=color], +input[type=reset], +input[type=submit] { padding-left: 20px; padding-right: 20px; } @@ -126,35 +145,72 @@ option { background: white; } -input[type=input]:focus, input[type=password]:focus, -input:not([type]):focus, input[type=button]:focus, +input:not([type]):focus, +input[type=button]:focus, +input[type=color]:focus, +input[type=date]:focus, +input[type=datetime-local]:focus, +input[type=email]:focus, +input[type=month]:focus, +input[type=number]:focus, +input[type=password]:focus, +input[type=reset]:focus, +input[type=search]:focus, input[type=submit]:focus, -textarea:focus, select:focus { +input[type=tel]:focus, +input[type=text]:focus, +input[type=time]:focus, +input[type=url]:focus, +input[type=week]:focus, +select:focus, +textarea:focus { box-shadow: 0px 0px 3px rgba(74, 144, 217, 0.5); border-color: rgb(74, 144, 217); outline: none; } input[type=button]::-moz-focus-inner, +input[type=color]::-moz-focus-inner, +input[type=reset]::-moz-focus-inner, input[type=submit]::-moz-focus-inner { border: none; } -input[type=input]:disabled, input[type=password]:disabled, -input:not([type]):disabled, input[type=button]:disabled, -input[type=submit]:disabled, input[type=number]:disabled, -textarea:disabled, select:disabled { +input:not([type]):disabled, +input[type=button]:disabled, +input[type=color]:disabled, +input[type=date]:disabled, +input[type=datetime-local]:disabled, +input[type=email]:disabled, +input[type=month]:disabled, +input[type=number]:disabled, +input[type=password]:disabled, +input[type=reset]:disabled, +input[type=search]:disabled, +input[type=submit]:disabled, +input[type=tel]:disabled, +input[type=text]:disabled, +input[type=time]:disabled, +input[type=url]:disabled, +input[type=week]:disabled, +select:disabled, +textarea:disabled { color: rgb(128, 128, 128); background: rgb(240, 240, 240); } -input[type=button]:active, input[type=submit]:active, +input[type=button]:active, +input[type=color]:active, +input[type=reset]:active, +input[type=submit]:active, select:active { border-bottom-width: 1px; margin-top: 3px; } :root:not(.noVNC_touch) input[type=button]:hover:not(:disabled), +:root:not(.noVNC_touch) input[type=color]:hover:not(:disabled), +:root:not(.noVNC_touch) input[type=reset]:hover:not(:disabled), :root:not(.noVNC_touch) input[type=submit]:hover:not(:disabled), :root:not(.noVNC_touch) select:hover:not(:disabled) { background: linear-gradient(to top, rgb(255, 255, 255), rgb(250, 250, 250)); @@ -579,7 +635,7 @@ select:active { } /* Extra manual keys */ -:root:not(.noVNC_connected) #noVNC_extra_keys { +:root:not(.noVNC_connected) #noVNC_toggle_extra_keys_button { display: none; } @@ -631,6 +687,16 @@ select:active { width: 100px; } +/* Version */ + +.noVNC_version_wrapper { + font-size: small; +} + +.noVNC_version { + margin-left: 1rem; +} + /* Connection Controls */ :root:not(.noVNC_connected) #noVNC_disconnect_button { display: none; @@ -780,19 +846,23 @@ select:active { * ---------------------------------------- */ -#noVNC_password_dlg { +#noVNC_credentials_dlg { position: relative; transform: translateY(-50px); } -#noVNC_password_dlg.noVNC_open { +#noVNC_credentials_dlg.noVNC_open { transform: translateY(0); } -#noVNC_password_dlg ul { +#noVNC_credentials_dlg ul { list-style: none; margin: 0px; padding: 0px; } +.noVNC_hidden { + display: none; +} + /* ---------------------------------------- * Main Area diff --git a/systemvm/agent/noVNC/app/ui.js b/systemvm/agent/noVNC/app/ui.js index 13d1c015871f..9158c33f317a 100644 --- a/systemvm/agent/noVNC/app/ui.js +++ b/systemvm/agent/noVNC/app/ui.js @@ -1,6 +1,6 @@ /* * noVNC: HTML5 VNC client - * Copyright (C) 2018 The noVNC Authors + * Copyright (C) 2019 The noVNC Authors * Licensed under MPL 2.0 (see LICENSE.txt) * * See README.md for usage and integration instructions. @@ -8,7 +8,7 @@ import * as Log from '../core/util/logging.js'; import _, { l10n } from './localization.js'; -import { isTouchDevice, isSafari, isIOS, isAndroid, dragThreshold } +import { isTouchDevice, isSafari, hasScrollbarGutter, dragThreshold } from '../core/util/browser.js'; import { setCapture, getPointerEvent } from '../core/util/events.js'; import KeyTable from "../core/input/keysym.js"; @@ -17,6 +17,8 @@ import Keyboard from "../core/input/keyboard.js"; import RFB from "../core/rfb.js"; import * as WebUtil from "./webutil.js"; +const PAGE_TITLE = "noVNC"; + const UI = { connected: false, @@ -35,9 +37,11 @@ const UI = { lastKeyboardinput: null, defaultKeyboardinputLen: 100, - inhibit_reconnect: true, - reconnect_callback: null, - reconnect_password: null, + inhibitReconnect: true, + reconnectCallback: null, + reconnectPassword: null, + + fullScreen: false, prime() { return WebUtil.initSettings().then(() => { @@ -59,6 +63,17 @@ const UI = { // Translate the DOM l10n.translateDOM(); + WebUtil.fetchJSON('./package.json') + .then((packageInfo) => { + Array.from(document.getElementsByClassName('noVNC_version')).forEach(el => el.innerText = packageInfo.version); + }) + .catch((err) => { + Log.Error("Couldn't fetch package.json: " + err); + Array.from(document.getElementsByClassName('noVNC_version_wrapper')) + .concat(Array.from(document.getElementsByClassName('noVNC_version_separator'))) + .forEach(el => el.style.display = 'none'); + }); + // Adapt the interface for touch screen devices if (isTouchDevice) { document.documentElement.classList.add("noVNC_touch"); @@ -145,10 +160,13 @@ const UI = { /* Populate the controls if defaults are provided in the URL */ UI.initSetting('host', window.location.hostname); UI.initSetting('port', port); + UI.initSetting('token', window.location.token); UI.initSetting('encrypt', (window.location.protocol === "https:")); UI.initSetting('view_clip', false); UI.initSetting('resize', 'off'); - UI.initSetting('shared', false); + UI.initSetting('quality', 6); + UI.initSetting('compression', 2); + UI.initSetting('shared', true); UI.initSetting('view_only', false); UI.initSetting('show_dot', false); UI.initSetting('path', 'websockify'); @@ -219,14 +237,6 @@ const UI = { }, addTouchSpecificHandlers() { - document.getElementById("noVNC_mouse_button0") - .addEventListener('click', () => UI.setMouseButton(1)); - document.getElementById("noVNC_mouse_button1") - .addEventListener('click', () => UI.setMouseButton(2)); - document.getElementById("noVNC_mouse_button2") - .addEventListener('click', () => UI.setMouseButton(4)); - document.getElementById("noVNC_mouse_button4") - .addEventListener('click', () => UI.setMouseButton(0)); document.getElementById("noVNC_keyboard_button") .addEventListener('click', UI.toggleVirtualKeyboard); @@ -303,17 +313,17 @@ const UI = { document.getElementById("noVNC_cancel_reconnect_button") .addEventListener('click', UI.cancelReconnect); - document.getElementById("noVNC_password_button") - .addEventListener('click', UI.setPassword); + document.getElementById("noVNC_credentials_button") + .addEventListener('click', UI.setCredentials); }, addClipboardHandlers() { document.getElementById("noVNC_clipboard_button") .addEventListener('click', UI.toggleClipboardPanel); - document.getElementById("noVNC_clipboard_text") - .addEventListener('change', UI.clipboardSend); document.getElementById("noVNC_clipboard_clear_button") .addEventListener('click', UI.clipboardClear); + document.getElementById("noVNC_clipboard_send_button") + .addEventListener('click', UI.clipboardSend); }, // Add a call to save settings when the element changes, @@ -334,6 +344,10 @@ const UI = { UI.addSettingChangeHandler('resize'); UI.addSettingChangeHandler('resize', UI.applyResizeMode); UI.addSettingChangeHandler('resize', UI.updateViewClip); + UI.addSettingChangeHandler('quality'); + UI.addSettingChangeHandler('quality', UI.updateQuality); + UI.addSettingChangeHandler('compression'); + UI.addSettingChangeHandler('compression', UI.updateCompression); UI.addSettingChangeHandler('view_clip'); UI.addSettingChangeHandler('view_clip', UI.updateViewClip); UI.addSettingChangeHandler('shared'); @@ -375,25 +389,25 @@ const UI = { document.documentElement.classList.remove("noVNC_disconnecting"); document.documentElement.classList.remove("noVNC_reconnecting"); - const transition_elem = document.getElementById("noVNC_transition_text"); + const transitionElem = document.getElementById("noVNC_transition_text"); switch (state) { case 'init': break; case 'connecting': - transition_elem.textContent = _("Connecting..."); + transitionElem.textContent = _("Connecting..."); document.documentElement.classList.add("noVNC_connecting"); break; case 'connected': document.documentElement.classList.add("noVNC_connected"); break; case 'disconnecting': - transition_elem.textContent = _("Disconnecting..."); + transitionElem.textContent = _("Disconnecting..."); document.documentElement.classList.add("noVNC_disconnecting"); break; case 'disconnected': break; case 'reconnecting': - transition_elem.textContent = _("Reconnecting..."); + transitionElem.textContent = _("Reconnecting..."); document.documentElement.classList.add("noVNC_reconnecting"); break; default: @@ -411,7 +425,6 @@ const UI = { UI.disableSetting('port'); UI.disableSetting('path'); UI.disableSetting('repeaterID'); - UI.setMouseButton(1); // Hide the controlbar after 2 seconds UI.closeControlbarTimeout = setTimeout(UI.closeControlbar, 2000); @@ -426,38 +439,35 @@ const UI = { UI.keepControlbar(); } - // State change closes the password dialog - document.getElementById('noVNC_password_dlg') + // State change closes dialogs as they may not be relevant + // anymore + UI.closeAllPanels(); + document.getElementById('noVNC_credentials_dlg') .classList.remove('noVNC_open'); }, - showStatus(text, status_type, time) { + showStatus(text, statusType, time) { const statusElem = document.getElementById('noVNC_status'); - clearTimeout(UI.statusTimeout); - - if (typeof status_type === 'undefined') { - status_type = 'normal'; + if (typeof statusType === 'undefined') { + statusType = 'normal'; } // Don't overwrite more severe visible statuses and never // errors. Only shows the first error. - let visible_status_type = 'none'; if (statusElem.classList.contains("noVNC_open")) { if (statusElem.classList.contains("noVNC_status_error")) { - visible_status_type = 'error'; - } else if (statusElem.classList.contains("noVNC_status_warn")) { - visible_status_type = 'warn'; - } else { - visible_status_type = 'normal'; + return; + } + if (statusElem.classList.contains("noVNC_status_warn") && + statusType === 'normal') { + return; } } - if (visible_status_type === 'error' || - (visible_status_type === 'warn' && status_type === 'normal')) { - return; - } - switch (status_type) { + clearTimeout(UI.statusTimeout); + + switch (statusType) { case 'error': statusElem.classList.remove("noVNC_status_warn"); statusElem.classList.remove("noVNC_status_normal"); @@ -487,7 +497,7 @@ const UI = { } // Error messages do not timeout - if (status_type !== 'error') { + if (statusType !== 'error') { UI.statusTimeout = window.setTimeout(UI.hideStatus, time); } }, @@ -507,6 +517,13 @@ const UI = { }, idleControlbar() { + // Don't fade if a child of the control bar has focus + if (document.getElementById('noVNC_control_bar') + .contains(document.activeElement) && document.hasFocus()) { + UI.activateControlbar(); + return; + } + document.getElementById('noVNC_control_bar_anchor') .classList.add("noVNC_idle"); }, @@ -524,6 +541,7 @@ const UI = { UI.closeAllPanels(); document.getElementById('noVNC_control_bar') .classList.remove("noVNC_open"); + UI.rfb.focus(); }, toggleControlbar() { @@ -821,6 +839,8 @@ const UI = { UI.updateSetting('encrypt'); UI.updateSetting('view_clip'); UI.updateSetting('resize'); + UI.updateSetting('quality'); + UI.updateSetting('compression'); UI.updateSetting('shared'); UI.updateSetting('view_only'); UI.updateSetting('path'); @@ -927,6 +947,8 @@ const UI = { UI.closeClipboardPanel(); } else { UI.openClipboardPanel(); + setTimeout(() => document + .getElementById('noVNC_clipboard_text').focus(), 100); } }, @@ -938,14 +960,13 @@ const UI = { clipboardClear() { document.getElementById('noVNC_clipboard_text').value = ""; - UI.rfb.clipboardPasteFrom(""); }, clipboardSend() { const text = document.getElementById('noVNC_clipboard_text').value; - Log.Debug(">> UI.clipboardSend: " + text.substr(0, 40) + "..."); - UI.rfb.clipboardPasteFrom(text); - Log.Debug("<< UI.clipboardSend"); + UI.rfb.sendText(text); + UI.closeClipboardPanel(); + UI.focusOnConsole(); }, /* ------^------- @@ -974,10 +995,11 @@ const UI = { const host = UI.getSetting('host'); const port = UI.getSetting('port'); const path = UI.getSetting('path'); + const token = UI.getSetting('token') if (typeof password === 'undefined') { password = WebUtil.getConfigVar('password'); - UI.reconnect_password = password; + UI.reconnectPassword = password; } if (password === null) { @@ -992,7 +1014,6 @@ const UI = { return; } - UI.closeAllPanels(); UI.closeConnectPanel(); UI.updateVisualState('connecting'); @@ -1006,16 +1027,10 @@ const UI = { url += ':' + port; } url += '/' + path; - - var urlParams = new URLSearchParams(window.location.search); - var param = urlParams.get('token'); - if (param) { - url += "?token=" + param - } + url += '?token=' + token; UI.rfb = new RFB(document.getElementById('noVNC_container'), url, { shared: UI.getSetting('shared'), - showDotCursor: UI.getSetting('show_dot'), repeaterID: UI.getSetting('repeaterID'), credentials: { password: password } }); UI.rfb.addEventListener("connect", UI.connectFinished); @@ -1029,18 +1044,20 @@ const UI = { UI.rfb.clipViewport = UI.getSetting('view_clip'); UI.rfb.scaleViewport = UI.getSetting('resize') === 'scale'; UI.rfb.resizeSession = UI.getSetting('resize') === 'remote'; + UI.rfb.qualityLevel = parseInt(UI.getSetting('quality')); + UI.rfb.compressionLevel = parseInt(UI.getSetting('compression')); + UI.rfb.showDotCursor = UI.getSetting('show_dot'); UI.updateViewOnly(); // requires UI.rfb }, disconnect() { - UI.closeAllPanels(); UI.rfb.disconnect(); UI.connected = false; // Disable automatic reconnecting - UI.inhibit_reconnect = true; + UI.inhibitReconnect = true; UI.updateVisualState('disconnecting'); @@ -1048,20 +1065,20 @@ const UI = { }, reconnect() { - UI.reconnect_callback = null; + UI.reconnectCallback = null; // if reconnect has been disabled in the meantime, do nothing. - if (UI.inhibit_reconnect) { + if (UI.inhibitReconnect) { return; } - UI.connect(null, UI.reconnect_password); + UI.connect(null, UI.reconnectPassword); }, cancelReconnect() { - if (UI.reconnect_callback !== null) { - clearTimeout(UI.reconnect_callback); - UI.reconnect_callback = null; + if (UI.reconnectCallback !== null) { + clearTimeout(UI.reconnectCallback); + UI.reconnectCallback = null; } UI.updateVisualState('disconnected'); @@ -1072,13 +1089,13 @@ const UI = { connectFinished(e) { UI.connected = true; - UI.inhibit_reconnect = false; + UI.inhibitReconnect = false; let msg; if (UI.getSetting('encrypt')) { - msg = _("Connected (encrypted) to ") + UI.desktopName; + msg = _("Connected"); } else { - msg = _("Connected (unencrypted) to ") + UI.desktopName; + msg = _("Connected") } UI.showStatus(msg); UI.updateVisualState('connected'); @@ -1106,17 +1123,19 @@ const UI = { } else { UI.showStatus(_("Failed to connect to server"), 'error'); } - } else if (UI.getSetting('reconnect', false) === true && !UI.inhibit_reconnect) { + } else if (UI.getSetting('reconnect', false) === true && !UI.inhibitReconnect) { UI.updateVisualState('reconnecting'); const delay = parseInt(UI.getSetting('reconnect_delay')); - UI.reconnect_callback = setTimeout(UI.reconnect, delay); + UI.reconnectCallback = setTimeout(UI.reconnect, delay); return; } else { UI.updateVisualState('disconnected'); UI.showStatus(_("Disconnected"), 'normal'); } + document.title = PAGE_TITLE; + UI.openControlbar(); UI.openConnectPanel(); }, @@ -1143,27 +1162,46 @@ const UI = { credentials(e) { // FIXME: handle more types - document.getElementById('noVNC_password_dlg') + + document.getElementById("noVNC_username_block").classList.remove("noVNC_hidden"); + document.getElementById("noVNC_password_block").classList.remove("noVNC_hidden"); + + let inputFocus = "none"; + if (e.detail.types.indexOf("username") === -1) { + document.getElementById("noVNC_username_block").classList.add("noVNC_hidden"); + } else { + inputFocus = inputFocus === "none" ? "noVNC_username_input" : inputFocus; + } + if (e.detail.types.indexOf("password") === -1) { + document.getElementById("noVNC_password_block").classList.add("noVNC_hidden"); + } else { + inputFocus = inputFocus === "none" ? "noVNC_password_input" : inputFocus; + } + document.getElementById('noVNC_credentials_dlg') .classList.add('noVNC_open'); setTimeout(() => document - .getElementById('noVNC_password_input').focus(), 100); + .getElementById(inputFocus).focus(), 100); - Log.Warn("Server asked for a password"); - UI.showStatus(_("Password is required"), "warning"); + Log.Warn("Server asked for credentials"); + UI.showStatus(_("Credentials are required"), "warning"); }, - setPassword(e) { + setCredentials(e) { // Prevent actually submitting the form e.preventDefault(); - const inputElem = document.getElementById('noVNC_password_input'); - const password = inputElem.value; + let inputElemUsername = document.getElementById('noVNC_username_input'); + const username = inputElemUsername.value; + + let inputElemPassword = document.getElementById('noVNC_password_input'); + const password = inputElemPassword.value; // Clear the input after reading the password - inputElem.value = ""; - UI.rfb.sendCredentials({ password: password }); - UI.reconnect_password = password; - document.getElementById('noVNC_password_dlg') + inputElemPassword.value = ""; + + UI.rfb.sendCredentials({ username: username, password: password }); + UI.reconnectPassword = password; + document.getElementById('noVNC_credentials_dlg') .classList.remove('noVNC_open'); }, @@ -1174,38 +1212,14 @@ const UI = { * ------v------*/ toggleFullscreen() { - if (document.fullscreenElement || // alternative standard method - document.mozFullScreenElement || // currently working methods - document.webkitFullscreenElement || - document.msFullscreenElement) { - if (document.exitFullscreen) { - document.exitFullscreen(); - } else if (document.mozCancelFullScreen) { - document.mozCancelFullScreen(); - } else if (document.webkitExitFullscreen) { - document.webkitExitFullscreen(); - } else if (document.msExitFullscreen) { - document.msExitFullscreen(); - } - } else { - if (document.documentElement.requestFullscreen) { - document.documentElement.requestFullscreen(); - } else if (document.documentElement.mozRequestFullScreen) { - document.documentElement.mozRequestFullScreen(); - } else if (document.documentElement.webkitRequestFullscreen) { - document.documentElement.webkitRequestFullscreen(Element.ALLOW_KEYBOARD_INPUT); - } else if (document.body.msRequestFullscreen) { - document.body.msRequestFullscreen(); - } - } - UI.updateFullscreenButton(); + this.fullScreen = !this.fullScreen + UI.rfb.scaleViewport = this.fullScreen + UI.updateFullscreenButton(this.fullScreen); + UI.focusOnConsole(); }, - updateFullscreenButton() { - if (document.fullscreenElement || // alternative standard method - document.mozFullScreenElement || // currently working methods - document.webkitFullscreenElement || - document.msFullscreenElement ) { + updateFullscreenButton(fullScreen) { + if (fullScreen) { document.getElementById('noVNC_fullscreen_button') .classList.add("noVNC_selected"); } else { @@ -1246,8 +1260,9 @@ const UI = { // Can't be clipping if viewport is scaled to fit UI.forceSetting('view_clip', false); UI.rfb.clipViewport = false; - } else if (isIOS() || isAndroid()) { - // iOS and Android usually have shit scrollbars + } else if (!hasScrollbarGutter) { + // Some platforms have scrollbars that are difficult + // to use in our case, so we always use our own panning UI.forceSetting('view_clip', true); UI.rfb.clipViewport = true; } else { @@ -1290,30 +1305,40 @@ const UI = { viewDragButton.classList.remove("noVNC_selected"); } - // Different behaviour for touch vs non-touch - // The button is disabled instead of hidden on touch devices - if (isTouchDevice) { + if (UI.rfb.clipViewport) { viewDragButton.classList.remove("noVNC_hidden"); - - if (UI.rfb.clipViewport) { - viewDragButton.disabled = false; - } else { - viewDragButton.disabled = true; - } } else { - viewDragButton.disabled = false; - - if (UI.rfb.clipViewport) { - viewDragButton.classList.remove("noVNC_hidden"); - } else { - viewDragButton.classList.add("noVNC_hidden"); - } + viewDragButton.classList.add("noVNC_hidden"); } }, /* ------^------- * /VIEWDRAG * ============== + * QUALITY + * ------v------*/ + + updateQuality() { + if (!UI.rfb) return; + + UI.rfb.qualityLevel = parseInt(UI.getSetting('quality')); + }, + +/* ------^------- + * /QUALITY + * ============== + * COMPRESSION + * ------v------*/ + + updateCompression() { + if (!UI.rfb) return; + + UI.rfb.compressionLevel = parseInt(UI.getSetting('compression')); + }, + +/* ------^------- + * /COMPRESSION + * ============== * KEYBOARD * ------v------*/ @@ -1508,20 +1533,20 @@ const UI = { }, sendEsc() { - UI.rfb.sendKey(KeyTable.XK_Escape, "Escape"); + UI.sendKey(KeyTable.XK_Escape, "Escape"); }, sendTab() { - UI.rfb.sendKey(KeyTable.XK_Tab); + UI.sendKey(KeyTable.XK_Tab, "Tab"); }, toggleCtrl() { const btn = document.getElementById('noVNC_toggle_ctrl_button'); if (btn.classList.contains("noVNC_selected")) { - UI.rfb.sendKey(KeyTable.XK_Control_L, "ControlLeft", false); + UI.sendKey(KeyTable.XK_Control_L, "ControlLeft", false); btn.classList.remove("noVNC_selected"); } else { - UI.rfb.sendKey(KeyTable.XK_Control_L, "ControlLeft", true); + UI.sendKey(KeyTable.XK_Control_L, "ControlLeft", true); btn.classList.add("noVNC_selected"); } }, @@ -1529,10 +1554,10 @@ const UI = { toggleWindows() { const btn = document.getElementById('noVNC_toggle_windows_button'); if (btn.classList.contains("noVNC_selected")) { - UI.rfb.sendKey(KeyTable.XK_Super_L, "MetaLeft", false); + UI.sendKey(KeyTable.XK_Super_L, "MetaLeft", false); btn.classList.remove("noVNC_selected"); } else { - UI.rfb.sendKey(KeyTable.XK_Super_L, "MetaLeft", true); + UI.sendKey(KeyTable.XK_Super_L, "MetaLeft", true); btn.classList.add("noVNC_selected"); } }, @@ -1540,16 +1565,42 @@ const UI = { toggleAlt() { const btn = document.getElementById('noVNC_toggle_alt_button'); if (btn.classList.contains("noVNC_selected")) { - UI.rfb.sendKey(KeyTable.XK_Alt_L, "AltLeft", false); + UI.sendKey(KeyTable.XK_Alt_L, "AltLeft", false); btn.classList.remove("noVNC_selected"); } else { - UI.rfb.sendKey(KeyTable.XK_Alt_L, "AltLeft", true); + UI.sendKey(KeyTable.XK_Alt_L, "AltLeft", true); btn.classList.add("noVNC_selected"); } }, sendCtrlAltDel() { UI.rfb.sendCtrlAltDel(); + // See below + UI.rfb.focus(); + UI.idleControlbar(); + }, + + // Move focus to the screen in order to be able to use the + // keyboard right after these extra keys. + // The exception is when a virtual keyboard is used, because + // if we focus the screen the virtual keyboard would be closed. + // In this case we focus our special virtual keyboard input + // element instead. + focusOnConsole() { + if (document.getElementById('noVNC_keyboard_button') + .classList.contains("noVNC_selected")) { + document.getElementById('noVNC_keyboardinput').focus(); + } else { + UI.rfb.focus(); + } + }, + + sendKey(keysym, code, down) { + UI.rfb.sendKey(keysym, code, down); + UI.focusOnConsole() + // fade out the controlbar to highlight that + // the focus has been moved to the screen + UI.idleControlbar(); }, /* ------^------- @@ -1558,24 +1609,6 @@ const UI = { * MISC * ------v------*/ - setMouseButton(num) { - const view_only = UI.rfb.viewOnly; - if (UI.rfb && !view_only) { - UI.rfb.touchButton = num; - } - - const blist = [0, 1, 2, 4]; - for (let b = 0; b < blist.length; b++) { - const button = document.getElementById('noVNC_mouse_button' + - blist[b]); - if (blist[b] === num && !view_only) { - button.classList.remove("noVNC_hidden"); - } else { - button.classList.add("noVNC_hidden"); - } - } - }, - updateViewOnly() { if (!UI.rfb) return; UI.rfb.viewOnly = UI.getSetting('view_only'); @@ -1586,14 +1619,14 @@ const UI = { .classList.add('noVNC_hidden'); document.getElementById('noVNC_toggle_extra_keys_button') .classList.add('noVNC_hidden'); - document.getElementById('noVNC_mouse_button' + UI.rfb.touchButton) + document.getElementById('noVNC_clipboard_button') .classList.add('noVNC_hidden'); } else { document.getElementById('noVNC_keyboard_button') .classList.remove('noVNC_hidden'); document.getElementById('noVNC_toggle_extra_keys_button') .classList.remove('noVNC_hidden'); - document.getElementById('noVNC_mouse_button' + UI.rfb.touchButton) + document.getElementById('noVNC_clipboard_button') .classList.remove('noVNC_hidden'); } }, @@ -1604,13 +1637,13 @@ const UI = { }, updateLogging() { - WebUtil.init_logging(UI.getSetting('logging')); + WebUtil.initLogging(UI.getSetting('logging')); }, updateDesktopName(e) { UI.desktopName = e.detail.name; // Display the desktop name in the document title - document.title = e.detail.name + " - noVNC"; + document.title = e.detail.name + " - " + PAGE_TITLE; }, bell(e) { @@ -1646,7 +1679,7 @@ const UI = { }; // Set up translations -const LINGUAS = ["cs", "de", "el", "es", "ko", "nl", "pl", "ru", "sv", "tr", "zh_CN", "zh_TW"]; +const LINGUAS = ["cs", "de", "el", "es", "ja", "ko", "nl", "pl", "ru", "sv", "tr", "zh_CN", "zh_TW"]; l10n.setup(LINGUAS); if (l10n.language === "en" || l10n.dictionary !== undefined) { UI.prime(); diff --git a/systemvm/agent/noVNC/app/webutil.js b/systemvm/agent/noVNC/app/webutil.js index 98e1d9e68da4..568f0e24b4d4 100644 --- a/systemvm/agent/noVNC/app/webutil.js +++ b/systemvm/agent/noVNC/app/webutil.js @@ -1,21 +1,21 @@ /* * noVNC: HTML5 VNC client - * Copyright (C) 2018 The noVNC Authors + * Copyright (C) 2019 The noVNC Authors * Licensed under MPL 2.0 (see LICENSE.txt) * * See README.md for usage and integration instructions. */ -import { init_logging as main_init_logging } from '../core/util/logging.js'; +import { initLogging as mainInitLogging } from '../core/util/logging.js'; // init log level reading the logging HTTP param -export function init_logging(level) { +export function initLogging(level) { "use strict"; if (typeof level !== "undefined") { - main_init_logging(level); + mainInitLogging(level); } else { const param = document.location.href.match(/logging=([A-Za-z0-9._-]*)/); - main_init_logging(param || undefined); + mainInitLogging(param || undefined); } } @@ -115,13 +115,8 @@ export function eraseCookie(name) { let settings = {}; export function initSettings() { - if (!window.chrome || !window.chrome.storage) { - settings = {}; - return Promise.resolve(); - } - - return new Promise(resolve => window.chrome.storage.sync.get(resolve)) - .then((cfg) => { settings = cfg; }); + settings = {}; + return Promise.resolve(); } // Update the settings cache, but do not write to permanent storage @@ -134,22 +129,13 @@ export function writeSetting(name, value) { "use strict"; if (settings[name] === value) return; settings[name] = value; - if (window.chrome && window.chrome.storage) { - window.chrome.storage.sync.set(settings); - } else { - localStorage.setItem(name, value); - } } export function readSetting(name, defaultValue) { "use strict"; let value; - if ((name in settings) || (window.chrome && window.chrome.storage)) { - value = settings[name]; - } else { - value = localStorage.getItem(name); - settings[name] = value; - } + value = settings[name]; + if (typeof value === "undefined") { value = null; } @@ -169,11 +155,6 @@ export function eraseSetting(name) { // between this delete and the next read, it could lead to an unexpected // value change. delete settings[name]; - if (window.chrome && window.chrome.storage) { - window.chrome.storage.sync.remove(name); - } else { - localStorage.removeItem(name); - } } export function injectParamIfMissing(path, param, value) { @@ -184,7 +165,7 @@ export function injectParamIfMissing(path, param, value) { const elem = document.createElement('a'); elem.href = path; - const param_eq = encodeURIComponent(param) + "="; + const paramEq = encodeURIComponent(param) + "="; let query; if (elem.search) { query = elem.search.slice(1).split('&'); @@ -192,8 +173,8 @@ export function injectParamIfMissing(path, param, value) { query = []; } - if (!query.some(v => v.startsWith(param_eq))) { - query.push(param_eq + encodeURIComponent(value)); + if (!query.some(v => v.startsWith(paramEq))) { + query.push(paramEq + encodeURIComponent(value)); elem.search = "?" + query.join("&"); } diff --git a/systemvm/agent/noVNC/core/base64.js b/systemvm/agent/noVNC/core/base64.js index 88e745466e52..db572c2db4c0 100644 --- a/systemvm/agent/noVNC/core/base64.js +++ b/systemvm/agent/noVNC/core/base64.js @@ -57,12 +57,12 @@ export default { /* eslint-enable comma-spacing */ decode(data, offset = 0) { - let data_length = data.indexOf('=') - offset; - if (data_length < 0) { data_length = data.length - offset; } + let dataLength = data.indexOf('=') - offset; + if (dataLength < 0) { dataLength = data.length - offset; } /* Every four characters is 3 resulting numbers */ - const result_length = (data_length >> 2) * 3 + Math.floor((data_length % 4) / 1.5); - const result = new Array(result_length); + const resultLength = (dataLength >> 2) * 3 + Math.floor((dataLength % 4) / 1.5); + const result = new Array(resultLength); // Convert one by one. diff --git a/systemvm/agent/noVNC/core/decoders/copyrect.js b/systemvm/agent/noVNC/core/decoders/copyrect.js index a78ded754f9a..9e6391a17332 100644 --- a/systemvm/agent/noVNC/core/decoders/copyrect.js +++ b/systemvm/agent/noVNC/core/decoders/copyrect.js @@ -1,8 +1,6 @@ /* * noVNC: HTML5 VNC client - * Copyright (C) 2012 Joel Martin - * Copyright (C) 2018 Samuel Mannehed for Cendio AB - * Copyright (C) 2018 Pierre Ossman for Cendio AB + * Copyright (C) 2019 The noVNC Authors * Licensed under MPL 2.0 (see LICENSE.txt) * * See README.md for usage and integration instructions. @@ -17,6 +15,11 @@ export default class CopyRectDecoder { let deltaX = sock.rQshift16(); let deltaY = sock.rQshift16(); + + if ((width === 0) || (height === 0)) { + return true; + } + display.copyImage(deltaX, deltaY, x, y, width, height); return true; diff --git a/systemvm/agent/noVNC/core/decoders/hextile.js b/systemvm/agent/noVNC/core/decoders/hextile.js index aa76d2f37b1b..ac21eff03dbc 100644 --- a/systemvm/agent/noVNC/core/decoders/hextile.js +++ b/systemvm/agent/noVNC/core/decoders/hextile.js @@ -1,8 +1,6 @@ /* * noVNC: HTML5 VNC client - * Copyright (C) 2012 Joel Martin - * Copyright (C) 2018 Samuel Mannehed for Cendio AB - * Copyright (C) 2018 Pierre Ossman for Cendio AB + * Copyright (C) 2019 The noVNC Authors * Licensed under MPL 2.0 (see LICENSE.txt) * * See README.md for usage and integration instructions. @@ -15,14 +13,15 @@ export default class HextileDecoder { constructor() { this._tiles = 0; this._lastsubencoding = 0; + this._tileBuffer = new Uint8Array(16 * 16 * 4); } decodeRect(x, y, width, height, sock, display, depth) { if (this._tiles === 0) { - this._tiles_x = Math.ceil(width / 16); - this._tiles_y = Math.ceil(height / 16); - this._total_tiles = this._tiles_x * this._tiles_y; - this._tiles = this._total_tiles; + this._tilesX = Math.ceil(width / 16); + this._tilesY = Math.ceil(height / 16); + this._totalTiles = this._tilesX * this._tilesY; + this._tiles = this._totalTiles; } while (this._tiles > 0) { @@ -41,11 +40,11 @@ export default class HextileDecoder { subencoding + ")"); } - const curr_tile = this._total_tiles - this._tiles; - const tile_x = curr_tile % this._tiles_x; - const tile_y = Math.floor(curr_tile / this._tiles_x); - const tx = x + tile_x * 16; - const ty = y + tile_y * 16; + const currTile = this._totalTiles - this._tiles; + const tileX = currTile % this._tilesX; + const tileY = Math.floor(currTile / this._tilesX); + const tx = x + tileX * 16; + const ty = y + tileY * 16; const tw = Math.min(16, (x + width) - tx); const th = Math.min(16, (y + height) - ty); @@ -89,6 +88,11 @@ export default class HextileDecoder { display.fillRect(tx, ty, tw, th, this._background); } } else if (subencoding & 0x01) { // Raw + let pixels = tw * th; + // Max sure the image is fully opaque + for (let i = 0;i < pixels;i++) { + rQ[rQi + i * 4 + 3] = 255; + } display.blitImage(tx, ty, tw, th, rQ, rQi); rQi += bytes - 1; } else { @@ -101,7 +105,7 @@ export default class HextileDecoder { rQi += 4; } - display.startTile(tx, ty, tw, th, this._background); + this._startTile(tx, ty, tw, th, this._background); if (subencoding & 0x08) { // AnySubrects let subrects = rQ[rQi]; rQi++; @@ -124,10 +128,10 @@ export default class HextileDecoder { const sw = (wh >> 4) + 1; const sh = (wh & 0x0f) + 1; - display.subTile(sx, sy, sw, sh, color); + this._subTile(sx, sy, sw, sh, color); } } - display.finishTile(); + this._finishTile(display); } sock.rQi = rQi; this._lastsubencoding = subencoding; @@ -136,4 +140,52 @@ export default class HextileDecoder { return true; } + + // start updating a tile + _startTile(x, y, width, height, color) { + this._tileX = x; + this._tileY = y; + this._tileW = width; + this._tileH = height; + + const red = color[0]; + const green = color[1]; + const blue = color[2]; + + const data = this._tileBuffer; + for (let i = 0; i < width * height * 4; i += 4) { + data[i] = red; + data[i + 1] = green; + data[i + 2] = blue; + data[i + 3] = 255; + } + } + + // update sub-rectangle of the current tile + _subTile(x, y, w, h, color) { + const red = color[0]; + const green = color[1]; + const blue = color[2]; + const xend = x + w; + const yend = y + h; + + const data = this._tileBuffer; + const width = this._tileW; + for (let j = y; j < yend; j++) { + for (let i = x; i < xend; i++) { + const p = (i + (j * width)) * 4; + data[p] = red; + data[p + 1] = green; + data[p + 2] = blue; + data[p + 3] = 255; + } + } + } + + // draw the current tile to the screen + _finishTile(display) { + display.blitImage(this._tileX, this._tileY, + this._tileW, this._tileH, + this._tileBuffer, 0); + } } diff --git a/systemvm/agent/noVNC/core/decoders/raw.js b/systemvm/agent/noVNC/core/decoders/raw.js index f676e0d941f7..e8ea178e8f58 100644 --- a/systemvm/agent/noVNC/core/decoders/raw.js +++ b/systemvm/agent/noVNC/core/decoders/raw.js @@ -1,8 +1,6 @@ /* * noVNC: HTML5 VNC client - * Copyright (C) 2012 Joel Martin - * Copyright (C) 2018 Samuel Mannehed for Cendio AB - * Copyright (C) 2018 Pierre Ossman for Cendio AB + * Copyright (C) 2019 The noVNC Authors * Licensed under MPL 2.0 (see LICENSE.txt) * * See README.md for usage and integration instructions. @@ -15,6 +13,10 @@ export default class RawDecoder { } decodeRect(x, y, width, height, sock, display, depth) { + if ((width === 0) || (height === 0)) { + return true; + } + if (this._lines === 0) { this._lines = height; } @@ -26,29 +28,35 @@ export default class RawDecoder { return false; } - const cur_y = y + (height - this._lines); - const curr_height = Math.min(this._lines, - Math.floor(sock.rQlen / bytesPerLine)); + const curY = y + (height - this._lines); + const currHeight = Math.min(this._lines, + Math.floor(sock.rQlen / bytesPerLine)); + const pixels = width * currHeight; + let data = sock.rQ; let index = sock.rQi; // Convert data if needed if (depth == 8) { - const pixels = width * curr_height; const newdata = new Uint8Array(pixels * 4); for (let i = 0; i < pixels; i++) { newdata[i * 4 + 0] = ((data[index + i] >> 0) & 0x3) * 255 / 3; newdata[i * 4 + 1] = ((data[index + i] >> 2) & 0x3) * 255 / 3; newdata[i * 4 + 2] = ((data[index + i] >> 4) & 0x3) * 255 / 3; - newdata[i * 4 + 4] = 0; + newdata[i * 4 + 3] = 255; } data = newdata; index = 0; } - display.blitImage(x, cur_y, width, curr_height, data, index); - sock.rQskipBytes(curr_height * bytesPerLine); - this._lines -= curr_height; + // Max sure the image is fully opaque + for (let i = 0; i < pixels; i++) { + data[i * 4 + 3] = 255; + } + + display.blitImage(x, curY, width, currHeight, data, index); + sock.rQskipBytes(currHeight * bytesPerLine); + this._lines -= currHeight; if (this._lines > 0) { return false; } diff --git a/systemvm/agent/noVNC/core/decoders/rre.js b/systemvm/agent/noVNC/core/decoders/rre.js index 57414a098ff7..6219369d6b82 100644 --- a/systemvm/agent/noVNC/core/decoders/rre.js +++ b/systemvm/agent/noVNC/core/decoders/rre.js @@ -1,8 +1,6 @@ /* * noVNC: HTML5 VNC client - * Copyright (C) 2012 Joel Martin - * Copyright (C) 2018 Samuel Mannehed for Cendio AB - * Copyright (C) 2018 Pierre Ossman for Cendio AB + * Copyright (C) 2019 The noVNC Authors * Licensed under MPL 2.0 (see LICENSE.txt) * * See README.md for usage and integration instructions. diff --git a/systemvm/agent/noVNC/core/decoders/tight.js b/systemvm/agent/noVNC/core/decoders/tight.js index bcda04ce7f83..7952707c5e6b 100644 --- a/systemvm/agent/noVNC/core/decoders/tight.js +++ b/systemvm/agent/noVNC/core/decoders/tight.js @@ -1,9 +1,7 @@ /* * noVNC: HTML5 VNC client - * Copyright (C) 2012 Joel Martin + * Copyright (C) 2019 The noVNC Authors * (c) 2012 Michael Tinglof, Joe Balaz, Les Piech (Mercuri.ca) - * Copyright (C) 2018 Samuel Mannehed for Cendio AB - * Copyright (C) 2018 Pierre Ossman for Cendio AB * Licensed under MPL 2.0 (see LICENSE.txt) * * See README.md for usage and integration instructions. @@ -58,7 +56,7 @@ export default class TightDecoder { } else if (this._ctl === 0x0A) { ret = this._pngRect(x, y, width, height, sock, display, depth); - } else if ((this._ctl & 0x80) == 0) { + } else if ((this._ctl & 0x08) == 0) { ret = this._basicRect(this._ctl, x, y, width, height, sock, display, depth); } else { @@ -82,7 +80,7 @@ export default class TightDecoder { const rQ = sock.rQ; display.fillRect(x, y, width, height, - [rQ[rQi + 2], rQ[rQi + 1], rQ[rQi]], false); + [rQ[rQi], rQ[rQi + 1], rQ[rQi + 2]], false); sock.rQskipBytes(3); return true; @@ -94,7 +92,7 @@ export default class TightDecoder { return false; } - display.imageRect(x, y, "image/jpeg", data); + display.imageRect(x, y, width, height, "image/jpeg", data); return true; } @@ -150,6 +148,10 @@ export default class TightDecoder { const uncompressedSize = width * height * 3; let data; + if (uncompressedSize === 0) { + return true; + } + if (uncompressedSize < 12) { if (sock.rQwait("TIGHT", uncompressedSize)) { return false; @@ -162,13 +164,20 @@ export default class TightDecoder { return false; } - data = this._zlibs[streamId].inflate(data, true, uncompressedSize); - if (data.length != uncompressedSize) { - throw new Error("Incomplete zlib block"); - } + this._zlibs[streamId].setInput(data); + data = this._zlibs[streamId].inflate(uncompressedSize); + this._zlibs[streamId].setInput(null); + } + + let rgbx = new Uint8Array(width * height * 4); + for (let i = 0, j = 0; i < width * height * 4; i += 4, j += 3) { + rgbx[i] = data[j]; + rgbx[i + 1] = data[j + 1]; + rgbx[i + 2] = data[j + 2]; + rgbx[i + 3] = 255; // Alpha } - display.blitRgbImage(x, y, width, height, data, 0, false); + display.blitImage(x, y, width, height, rgbx, 0, false); return true; } @@ -198,6 +207,10 @@ export default class TightDecoder { let data; + if (uncompressedSize === 0) { + return true; + } + if (uncompressedSize < 12) { if (sock.rQwait("TIGHT", uncompressedSize)) { return false; @@ -210,10 +223,9 @@ export default class TightDecoder { return false; } - data = this._zlibs[streamId].inflate(data, true, uncompressedSize); - if (data.length != uncompressedSize) { - throw new Error("Incomplete zlib block"); - } + this._zlibs[streamId].setInput(data); + data = this._zlibs[streamId].inflate(uncompressedSize); + this._zlibs[streamId].setInput(null); } // Convert indexed (palette based) image data to RGB @@ -241,7 +253,7 @@ export default class TightDecoder { for (let b = 7; b >= 0; b--) { dp = (y * width + x * 8 + 7 - b) * 4; sp = (data[y * w + x] >> b & 1) * 3; - dest[dp] = palette[sp]; + dest[dp] = palette[sp]; dest[dp + 1] = palette[sp + 1]; dest[dp + 2] = palette[sp + 2]; dest[dp + 3] = 255; @@ -251,14 +263,14 @@ export default class TightDecoder { for (let b = 7; b >= 8 - width % 8; b--) { dp = (y * width + x * 8 + 7 - b) * 4; sp = (data[y * w + x] >> b & 1) * 3; - dest[dp] = palette[sp]; + dest[dp] = palette[sp]; dest[dp + 1] = palette[sp + 1]; dest[dp + 2] = palette[sp + 2]; dest[dp + 3] = 255; } } - display.blitRgbxImage(x, y, width, height, dest, 0, false); + display.blitImage(x, y, width, height, dest, 0, false); } _paletteRect(x, y, width, height, data, palette, display) { @@ -267,13 +279,13 @@ export default class TightDecoder { const total = width * height * 4; for (let i = 0, j = 0; i < total; i += 4, j++) { const sp = data[j] * 3; - dest[i] = palette[sp]; + dest[i] = palette[sp]; dest[i + 1] = palette[sp + 1]; dest[i + 2] = palette[sp + 2]; dest[i + 3] = 255; } - display.blitRgbxImage(x, y, width, height, dest, 0, false); + display.blitImage(x, y, width, height, dest, 0, false); } _gradientFilter(streamId, x, y, width, height, sock, display, depth) { diff --git a/systemvm/agent/noVNC/core/decoders/tightpng.js b/systemvm/agent/noVNC/core/decoders/tightpng.js index 7bbde3a43b58..82f492de8dbd 100644 --- a/systemvm/agent/noVNC/core/decoders/tightpng.js +++ b/systemvm/agent/noVNC/core/decoders/tightpng.js @@ -1,8 +1,6 @@ /* * noVNC: HTML5 VNC client - * Copyright (C) 2012 Joel Martin - * Copyright (C) 2018 Samuel Mannehed for Cendio AB - * Copyright (C) 2018 Pierre Ossman for Cendio AB + * Copyright (C) 2019 The noVNC Authors * Licensed under MPL 2.0 (see LICENSE.txt) * * See README.md for usage and integration instructions. @@ -18,7 +16,7 @@ export default class TightPNGDecoder extends TightDecoder { return false; } - display.imageRect(x, y, "image/png", data); + display.imageRect(x, y, width, height, "image/png", data); return true; } diff --git a/systemvm/agent/noVNC/core/deflator.js b/systemvm/agent/noVNC/core/deflator.js new file mode 100644 index 000000000000..fe2a8f7036b3 --- /dev/null +++ b/systemvm/agent/noVNC/core/deflator.js @@ -0,0 +1,85 @@ +/* + * noVNC: HTML5 VNC client + * Copyright (C) 2020 The noVNC Authors + * Licensed under MPL 2.0 (see LICENSE.txt) + * + * See README.md for usage and integration instructions. + */ + +import { deflateInit, deflate } from "../vendor/pako/lib/zlib/deflate.js"; +import { Z_FULL_FLUSH } from "../vendor/pako/lib/zlib/deflate.js"; +import ZStream from "../vendor/pako/lib/zlib/zstream.js"; + +export default class Deflator { + constructor() { + this.strm = new ZStream(); + this.chunkSize = 1024 * 10 * 10; + this.outputBuffer = new Uint8Array(this.chunkSize); + this.windowBits = 5; + + deflateInit(this.strm, this.windowBits); + } + + deflate(inData) { + /* eslint-disable camelcase */ + this.strm.input = inData; + this.strm.avail_in = this.strm.input.length; + this.strm.next_in = 0; + this.strm.output = this.outputBuffer; + this.strm.avail_out = this.chunkSize; + this.strm.next_out = 0; + /* eslint-enable camelcase */ + + let lastRet = deflate(this.strm, Z_FULL_FLUSH); + let outData = new Uint8Array(this.strm.output.buffer, 0, this.strm.next_out); + + if (lastRet < 0) { + throw new Error("zlib deflate failed"); + } + + if (this.strm.avail_in > 0) { + // Read chunks until done + + let chunks = [outData]; + let totalLen = outData.length; + do { + /* eslint-disable camelcase */ + this.strm.output = new Uint8Array(this.chunkSize); + this.strm.next_out = 0; + this.strm.avail_out = this.chunkSize; + /* eslint-enable camelcase */ + + lastRet = deflate(this.strm, Z_FULL_FLUSH); + + if (lastRet < 0) { + throw new Error("zlib deflate failed"); + } + + let chunk = new Uint8Array(this.strm.output.buffer, 0, this.strm.next_out); + totalLen += chunk.length; + chunks.push(chunk); + } while (this.strm.avail_in > 0); + + // Combine chunks into a single data + + let newData = new Uint8Array(totalLen); + let offset = 0; + + for (let i = 0; i < chunks.length; i++) { + newData.set(chunks[i], offset); + offset += chunks[i].length; + } + + outData = newData; + } + + /* eslint-disable camelcase */ + this.strm.input = null; + this.strm.avail_in = 0; + this.strm.next_in = 0; + /* eslint-enable camelcase */ + + return outData; + } + +} diff --git a/systemvm/agent/noVNC/core/display.js b/systemvm/agent/noVNC/core/display.js index 1528384d3afd..8eaa8001cc60 100644 --- a/systemvm/agent/noVNC/core/display.js +++ b/systemvm/agent/noVNC/core/display.js @@ -1,6 +1,6 @@ /* * noVNC: HTML5 VNC client - * Copyright (C) 2018 The noVNC Authors + * Copyright (C) 2019 The noVNC Authors * Licensed under MPL 2.0 (see LICENSE.txt) * * See README.md for usage and integration instructions. @@ -9,24 +9,20 @@ import * as Log from './util/logging.js'; import Base64 from "./base64.js"; import { supportsImageMetadata } from './util/browser.js'; +import { toSigned32bit } from './util/int.js'; export default class Display { constructor(target) { this._drawCtx = null; - this._c_forceCanvas = false; this._renderQ = []; // queue drawing actions for in-oder rendering this._flushing = false; // the full frame buffer (logical canvas) size - this._fb_width = 0; - this._fb_height = 0; + this._fbWidth = 0; + this._fbHeight = 0; this._prevDrawStyle = ""; - this._tile = null; - this._tile16x16 = null; - this._tile_x = 0; - this._tile_y = 0; Log.Debug(">> Display.constructor"); @@ -60,21 +56,17 @@ export default class Display { Log.Debug("User Agent: " + navigator.userAgent); - this.clear(); - // Check canvas features if (!('createImageData' in this._drawCtx)) { throw new Error("Canvas does not support createImageData"); } - this._tile16x16 = this._drawCtx.createImageData(16, 16); Log.Debug("<< Display.constructor"); // ===== PROPERTIES ===== this._scale = 1.0; this._clipViewport = false; - this.logo = null; // ===== EVENT HANDLERS ===== @@ -98,11 +90,11 @@ export default class Display { } get width() { - return this._fb_width; + return this._fbWidth; } get height() { - return this._fb_height; + return this._fbHeight; } // ===== PUBLIC METHODS ===== @@ -125,15 +117,15 @@ export default class Display { if (deltaX < 0 && vp.x + deltaX < 0) { deltaX = -vp.x; } - if (vx2 + deltaX >= this._fb_width) { - deltaX -= vx2 + deltaX - this._fb_width + 1; + if (vx2 + deltaX >= this._fbWidth) { + deltaX -= vx2 + deltaX - this._fbWidth + 1; } if (vp.y + deltaY < 0) { deltaY = -vp.y; } - if (vy2 + deltaY >= this._fb_height) { - deltaY -= (vy2 + deltaY - this._fb_height + 1); + if (vy2 + deltaY >= this._fbHeight) { + deltaY -= (vy2 + deltaY - this._fbHeight + 1); } if (deltaX === 0 && deltaY === 0) { @@ -156,18 +148,18 @@ export default class Display { typeof(height) === "undefined") { Log.Debug("Setting viewport to full display region"); - width = this._fb_width; - height = this._fb_height; + width = this._fbWidth; + height = this._fbHeight; } width = Math.floor(width); height = Math.floor(height); - if (width > this._fb_width) { - width = this._fb_width; + if (width > this._fbWidth) { + width = this._fbWidth; } - if (height > this._fb_height) { - height = this._fb_height; + if (height > this._fbHeight) { + height = this._fbHeight; } const vp = this._viewportLoc; @@ -194,21 +186,21 @@ export default class Display { if (this._scale === 0) { return 0; } - return x / this._scale + this._viewportLoc.x; + return toSigned32bit(x / this._scale + this._viewportLoc.x); } absY(y) { if (this._scale === 0) { return 0; } - return y / this._scale + this._viewportLoc.y; + return toSigned32bit(y / this._scale + this._viewportLoc.y); } resize(width, height) { this._prevDrawStyle = ""; - this._fb_width = width; - this._fb_height = height; + this._fbWidth = width; + this._fbHeight = height; const canvas = this._backbuffer; if (canvas.width !== width || canvas.height !== height) { @@ -256,9 +248,9 @@ export default class Display { // Update the visible canvas with the contents of the // rendering canvas - flip(from_queue) { - if (this._renderQ.length !== 0 && !from_queue) { - this._renderQ_push({ + flip(fromQueue) { + if (this._renderQ.length !== 0 && !fromQueue) { + this._renderQPush({ 'type': 'flip' }); } else { @@ -302,17 +294,6 @@ export default class Display { } } - clear() { - if (this._logo) { - this.resize(this._logo.width, this._logo.height); - this.imageRect(0, 0, this._logo.type, this._logo.data); - } else { - this.resize(240, 20); - this._drawCtx.clearRect(0, 0, this._fb_width, this._fb_height); - } - this.flip(); - } - pending() { return this._renderQ.length > 0; } @@ -325,9 +306,9 @@ export default class Display { } } - fillRect(x, y, width, height, color, from_queue) { - if (this._renderQ.length !== 0 && !from_queue) { - this._renderQ_push({ + fillRect(x, y, width, height, color, fromQueue) { + if (this._renderQ.length !== 0 && !fromQueue) { + this._renderQPush({ 'type': 'fill', 'x': x, 'y': y, @@ -342,14 +323,14 @@ export default class Display { } } - copyImage(old_x, old_y, new_x, new_y, w, h, from_queue) { - if (this._renderQ.length !== 0 && !from_queue) { - this._renderQ_push({ + copyImage(oldX, oldY, newX, newY, w, h, fromQueue) { + if (this._renderQ.length !== 0 && !fromQueue) { + this._renderQPush({ 'type': 'copy', - 'old_x': old_x, - 'old_y': old_y, - 'x': new_x, - 'y': new_y, + 'oldX': oldX, + 'oldY': oldY, + 'x': newX, + 'y': newY, 'width': w, 'height': h, }); @@ -367,131 +348,60 @@ export default class Display { this._drawCtx.imageSmoothingEnabled = false; this._drawCtx.drawImage(this._backbuffer, - old_x, old_y, w, h, - new_x, new_y, w, h); - this._damage(new_x, new_y, w, h); + oldX, oldY, w, h, + newX, newY, w, h); + this._damage(newX, newY, w, h); } } - imageRect(x, y, mime, arr) { + imageRect(x, y, width, height, mime, arr) { + /* The internal logic cannot handle empty images, so bail early */ + if ((width === 0) || (height === 0)) { + return; + } + const img = new Image(); img.src = "data: " + mime + ";base64," + Base64.encode(arr); - this._renderQ_push({ + + this._renderQPush({ 'type': 'img', 'img': img, 'x': x, - 'y': y + 'y': y, + 'width': width, + 'height': height }); } - // start updating a tile - startTile(x, y, width, height, color) { - this._tile_x = x; - this._tile_y = y; - if (width === 16 && height === 16) { - this._tile = this._tile16x16; - } else { - this._tile = this._drawCtx.createImageData(width, height); - } - - const red = color[2]; - const green = color[1]; - const blue = color[0]; - - const data = this._tile.data; - for (let i = 0; i < width * height * 4; i += 4) { - data[i] = red; - data[i + 1] = green; - data[i + 2] = blue; - data[i + 3] = 255; - } - } - - // update sub-rectangle of the current tile - subTile(x, y, w, h, color) { - const red = color[2]; - const green = color[1]; - const blue = color[0]; - const xend = x + w; - const yend = y + h; - - const data = this._tile.data; - const width = this._tile.width; - for (let j = y; j < yend; j++) { - for (let i = x; i < xend; i++) { - const p = (i + (j * width)) * 4; - data[p] = red; - data[p + 1] = green; - data[p + 2] = blue; - data[p + 3] = 255; - } - } - } - - // draw the current tile to the screen - finishTile() { - this._drawCtx.putImageData(this._tile, this._tile_x, this._tile_y); - this._damage(this._tile_x, this._tile_y, - this._tile.width, this._tile.height); - } - - blitImage(x, y, width, height, arr, offset, from_queue) { - if (this._renderQ.length !== 0 && !from_queue) { + blitImage(x, y, width, height, arr, offset, fromQueue) { + if (this._renderQ.length !== 0 && !fromQueue) { // NB(directxman12): it's technically more performant here to use preallocated arrays, // but it's a lot of extra work for not a lot of payoff -- if we're using the render queue, // this probably isn't getting called *nearly* as much - const new_arr = new Uint8Array(width * height * 4); - new_arr.set(new Uint8Array(arr.buffer, 0, new_arr.length)); - this._renderQ_push({ + const newArr = new Uint8Array(width * height * 4); + newArr.set(new Uint8Array(arr.buffer, 0, newArr.length)); + this._renderQPush({ 'type': 'blit', - 'data': new_arr, + 'data': newArr, 'x': x, 'y': y, 'width': width, 'height': height, }); } else { - this._bgrxImageData(x, y, width, height, arr, offset); - } - } - - blitRgbImage(x, y, width, height, arr, offset, from_queue) { - if (this._renderQ.length !== 0 && !from_queue) { - // NB(directxman12): it's technically more performant here to use preallocated arrays, - // but it's a lot of extra work for not a lot of payoff -- if we're using the render queue, - // this probably isn't getting called *nearly* as much - const new_arr = new Uint8Array(width * height * 3); - new_arr.set(new Uint8Array(arr.buffer, 0, new_arr.length)); - this._renderQ_push({ - 'type': 'blitRgb', - 'data': new_arr, - 'x': x, - 'y': y, - 'width': width, - 'height': height, - }); - } else { - this._rgbImageData(x, y, width, height, arr, offset); - } - } - - blitRgbxImage(x, y, width, height, arr, offset, from_queue) { - if (this._renderQ.length !== 0 && !from_queue) { - // NB(directxman12): it's technically more performant here to use preallocated arrays, - // but it's a lot of extra work for not a lot of payoff -- if we're using the render queue, - // this probably isn't getting called *nearly* as much - const new_arr = new Uint8Array(width * height * 4); - new_arr.set(new Uint8Array(arr.buffer, 0, new_arr.length)); - this._renderQ_push({ - 'type': 'blitRgbx', - 'data': new_arr, - 'x': x, - 'y': y, - 'width': width, - 'height': height, - }); - } else { - this._rgbxImageData(x, y, width, height, arr, offset); + // NB(directxman12): arr must be an Type Array view + let data = new Uint8ClampedArray(arr.buffer, + arr.byteOffset + offset, + width * height * 4); + let img; + if (supportsImageMetadata) { + img = new ImageData(data, width, height); + } else { + img = this._drawCtx.createImageData(width, height); + img.data.set(data); + } + this._drawCtx.putImageData(img, x, y); + this._damage(x, y, width, height); } } @@ -543,69 +453,30 @@ export default class Display { } _setFillColor(color) { - const newStyle = 'rgb(' + color[2] + ',' + color[1] + ',' + color[0] + ')'; + const newStyle = 'rgb(' + color[0] + ',' + color[1] + ',' + color[2] + ')'; if (newStyle !== this._prevDrawStyle) { this._drawCtx.fillStyle = newStyle; this._prevDrawStyle = newStyle; } } - _rgbImageData(x, y, width, height, arr, offset) { - const img = this._drawCtx.createImageData(width, height); - const data = img.data; - for (let i = 0, j = offset; i < width * height * 4; i += 4, j += 3) { - data[i] = arr[j]; - data[i + 1] = arr[j + 1]; - data[i + 2] = arr[j + 2]; - data[i + 3] = 255; // Alpha - } - this._drawCtx.putImageData(img, x, y); - this._damage(x, y, img.width, img.height); - } - - _bgrxImageData(x, y, width, height, arr, offset) { - const img = this._drawCtx.createImageData(width, height); - const data = img.data; - for (let i = 0, j = offset; i < width * height * 4; i += 4, j += 4) { - data[i] = arr[j + 2]; - data[i + 1] = arr[j + 1]; - data[i + 2] = arr[j]; - data[i + 3] = 255; // Alpha - } - this._drawCtx.putImageData(img, x, y); - this._damage(x, y, img.width, img.height); - } - - _rgbxImageData(x, y, width, height, arr, offset) { - // NB(directxman12): arr must be an Type Array view - let img; - if (supportsImageMetadata) { - img = new ImageData(new Uint8ClampedArray(arr.buffer, arr.byteOffset, width * height * 4), width, height); - } else { - img = this._drawCtx.createImageData(width, height); - img.data.set(new Uint8ClampedArray(arr.buffer, arr.byteOffset, width * height * 4)); - } - this._drawCtx.putImageData(img, x, y); - this._damage(x, y, img.width, img.height); - } - - _renderQ_push(action) { + _renderQPush(action) { this._renderQ.push(action); if (this._renderQ.length === 1) { // If this can be rendered immediately it will be, otherwise // the scanner will wait for the relevant event - this._scan_renderQ(); + this._scanRenderQ(); } } - _resume_renderQ() { + _resumeRenderQ() { // "this" is the object that is ready, not the // display object - this.removeEventListener('load', this._noVNC_display._resume_renderQ); - this._noVNC_display._scan_renderQ(); + this.removeEventListener('load', this._noVNCDisplay._resumeRenderQ); + this._noVNCDisplay._scanRenderQ(); } - _scan_renderQ() { + _scanRenderQ() { let ready = true; while (ready && this._renderQ.length > 0) { const a = this._renderQ[0]; @@ -614,7 +485,7 @@ export default class Display { this.flip(true); break; case 'copy': - this.copyImage(a.old_x, a.old_y, a.x, a.y, a.width, a.height, true); + this.copyImage(a.oldX, a.oldY, a.x, a.y, a.width, a.height, true); break; case 'fill': this.fillRect(a.x, a.y, a.width, a.height, a.color, true); @@ -622,18 +493,19 @@ export default class Display { case 'blit': this.blitImage(a.x, a.y, a.width, a.height, a.data, 0, true); break; - case 'blitRgb': - this.blitRgbImage(a.x, a.y, a.width, a.height, a.data, 0, true); - break; - case 'blitRgbx': - this.blitRgbxImage(a.x, a.y, a.width, a.height, a.data, 0, true); - break; case 'img': - if (a.img.complete) { + /* IE tends to set "complete" prematurely, so check dimensions */ + if (a.img.complete && (a.img.width !== 0) && (a.img.height !== 0)) { + if (a.img.width !== a.width || a.img.height !== a.height) { + Log.Error("Decoded image has incorrect dimensions. Got " + + a.img.width + "x" + a.img.height + ". Expected " + + a.width + "x" + a.height + "."); + return; + } this.drawImage(a.img, a.x, a.y); } else { - a.img._noVNC_display = this; - a.img.addEventListener('load', this._resume_renderQ); + a.img._noVNCDisplay = this; + a.img.addEventListener('load', this._resumeRenderQ); // We need to wait for this image to 'load' // to keep things in-order ready = false; diff --git a/systemvm/agent/noVNC/core/encodings.js b/systemvm/agent/noVNC/core/encodings.js index 9fd38d58fcc3..51c099291682 100644 --- a/systemvm/agent/noVNC/core/encodings.js +++ b/systemvm/agent/noVNC/core/encodings.js @@ -1,6 +1,6 @@ /* * noVNC: HTML5 VNC client - * Copyright (C) 2018 The noVNC Authors + * Copyright (C) 2019 The noVNC Authors * Licensed under MPL 2.0 (see LICENSE.txt) * * See README.md for usage and integration instructions. @@ -20,12 +20,15 @@ export const encodings = { pseudoEncodingLastRect: -224, pseudoEncodingCursor: -239, pseudoEncodingQEMUExtendedKeyEvent: -258, + pseudoEncodingDesktopName: -307, pseudoEncodingExtendedDesktopSize: -308, pseudoEncodingXvp: -309, pseudoEncodingFence: -312, pseudoEncodingContinuousUpdates: -313, pseudoEncodingCompressLevel9: -247, pseudoEncodingCompressLevel0: -256, + pseudoEncodingVMwareCursor: 0x574d5664, + pseudoEncodingExtendedClipboard: 0xc0a1e5ce }; export function encodingName(num) { diff --git a/systemvm/agent/noVNC/core/inflator.js b/systemvm/agent/noVNC/core/inflator.js index 0eab8fe48c2c..4b337607b039 100644 --- a/systemvm/agent/noVNC/core/inflator.js +++ b/systemvm/agent/noVNC/core/inflator.js @@ -1,3 +1,11 @@ +/* + * noVNC: HTML5 VNC client + * Copyright (C) 2020 The noVNC Authors + * Licensed under MPL 2.0 (see LICENSE.txt) + * + * See README.md for usage and integration instructions. + */ + import { inflateInit, inflate, inflateReset } from "../vendor/pako/lib/zlib/inflate.js"; import ZStream from "../vendor/pako/lib/zlib/zstream.js"; @@ -11,12 +19,22 @@ export default class Inflate { inflateInit(this.strm, this.windowBits); } - inflate(data, flush, expected) { - this.strm.input = data; - this.strm.avail_in = this.strm.input.length; - this.strm.next_in = 0; - this.strm.next_out = 0; + setInput(data) { + if (!data) { + //FIXME: flush remaining data. + /* eslint-disable camelcase */ + this.strm.input = null; + this.strm.avail_in = 0; + this.strm.next_in = 0; + } else { + this.strm.input = data; + this.strm.avail_in = this.strm.input.length; + this.strm.next_in = 0; + /* eslint-enable camelcase */ + } + } + inflate(expected) { // resize our output buffer if it's too small // (we could just use multiple chunks, but that would cause an extra // allocation each time to flatten the chunks) @@ -25,9 +43,19 @@ export default class Inflate { this.strm.output = new Uint8Array(this.chunkSize); } - this.strm.avail_out = this.chunkSize; + /* eslint-disable camelcase */ + this.strm.next_out = 0; + this.strm.avail_out = expected; + /* eslint-enable camelcase */ + + let ret = inflate(this.strm, 0); // Flush argument not used. + if (ret < 0) { + throw new Error("zlib inflate failed"); + } - inflate(this.strm, flush); + if (this.strm.next_out != expected) { + throw new Error("Incomplete zlib block"); + } return new Uint8Array(this.strm.output.buffer, 0, this.strm.next_out); } diff --git a/systemvm/agent/noVNC/core/input/domkeytable.js b/systemvm/agent/noVNC/core/input/domkeytable.js index 60ae3f91902e..b84ad45de55a 100644 --- a/systemvm/agent/noVNC/core/input/domkeytable.js +++ b/systemvm/agent/noVNC/core/input/domkeytable.js @@ -43,12 +43,10 @@ addStandard("CapsLock", KeyTable.XK_Caps_Lock); addLeftRight("Control", KeyTable.XK_Control_L, KeyTable.XK_Control_R); // - Fn // - FnLock -addLeftRight("Hyper", KeyTable.XK_Super_L, KeyTable.XK_Super_R); addLeftRight("Meta", KeyTable.XK_Super_L, KeyTable.XK_Super_R); addStandard("NumLock", KeyTable.XK_Num_Lock); addStandard("ScrollLock", KeyTable.XK_Scroll_Lock); addLeftRight("Shift", KeyTable.XK_Shift_L, KeyTable.XK_Shift_R); -addLeftRight("Super", KeyTable.XK_Super_L, KeyTable.XK_Super_R); // - Symbol // - SymbolLock @@ -72,6 +70,9 @@ addNumpad("PageUp", KeyTable.XK_Prior, KeyTable.XK_KP_Prior); // 2.5. Editing Keys addStandard("Backspace", KeyTable.XK_BackSpace); +// Browsers send "Clear" for the numpad 5 without NumLock because +// Windows uses VK_Clear for that key. But Unix expects KP_Begin for +// that scenario. addNumpad("Clear", KeyTable.XK_Clear, KeyTable.XK_KP_Begin); addStandard("Copy", KeyTable.XF86XK_Copy); // - CrSel @@ -194,7 +195,8 @@ addStandard("F35", KeyTable.XK_F35); addStandard("Close", KeyTable.XF86XK_Close); addStandard("MailForward", KeyTable.XF86XK_MailForward); addStandard("MailReply", KeyTable.XF86XK_Reply); -addStandard("MainSend", KeyTable.XF86XK_Send); +addStandard("MailSend", KeyTable.XF86XK_Send); +// - MediaClose addStandard("MediaFastForward", KeyTable.XF86XK_AudioForward); addStandard("MediaPause", KeyTable.XF86XK_AudioPause); addStandard("MediaPlay", KeyTable.XF86XK_AudioPlay); @@ -218,11 +220,9 @@ addStandard("SpellCheck", KeyTable.XF86XK_Spell); // - AudioBalanceLeft // - AudioBalanceRight -// - AudioBassDown // - AudioBassBoostDown // - AudioBassBoostToggle // - AudioBassBoostUp -// - AudioBassUp // - AudioFaderFront // - AudioFaderRear // - AudioSurroundModeNext @@ -243,12 +243,12 @@ addStandard("MicrophoneVolumeMute", KeyTable.XF86XK_AudioMicMute); // 2.14. Application Keys -addStandard("LaunchCalculator", KeyTable.XF86XK_Calculator); +addStandard("LaunchApplication1", KeyTable.XF86XK_MyComputer); +addStandard("LaunchApplication2", KeyTable.XF86XK_Calculator); addStandard("LaunchCalendar", KeyTable.XF86XK_Calendar); addStandard("LaunchMail", KeyTable.XF86XK_Mail); addStandard("LaunchMediaPlayer", KeyTable.XF86XK_AudioMedia); addStandard("LaunchMusicPlayer", KeyTable.XF86XK_Music); -addStandard("LaunchMyComputer", KeyTable.XF86XK_MyComputer); addStandard("LaunchPhone", KeyTable.XF86XK_Phone); addStandard("LaunchScreenSaver", KeyTable.XF86XK_ScreenSaver); addStandard("LaunchSpreadsheet", KeyTable.XF86XK_Excel); diff --git a/systemvm/agent/noVNC/core/input/gesturehandler.js b/systemvm/agent/noVNC/core/input/gesturehandler.js new file mode 100644 index 000000000000..6fa72d2aac5b --- /dev/null +++ b/systemvm/agent/noVNC/core/input/gesturehandler.js @@ -0,0 +1,567 @@ +/* + * noVNC: HTML5 VNC client + * Copyright (C) 2020 The noVNC Authors + * Licensed under MPL 2.0 (see LICENSE.txt) + * + * See README.md for usage and integration instructions. + * + */ + +const GH_NOGESTURE = 0; +const GH_ONETAP = 1; +const GH_TWOTAP = 2; +const GH_THREETAP = 4; +const GH_DRAG = 8; +const GH_LONGPRESS = 16; +const GH_TWODRAG = 32; +const GH_PINCH = 64; + +const GH_INITSTATE = 127; + +const GH_MOVE_THRESHOLD = 50; +const GH_ANGLE_THRESHOLD = 90; // Degrees + +// Timeout when waiting for gestures (ms) +const GH_MULTITOUCH_TIMEOUT = 250; + +// Maximum time between press and release for a tap (ms) +const GH_TAP_TIMEOUT = 1000; + +// Timeout when waiting for longpress (ms) +const GH_LONGPRESS_TIMEOUT = 1000; + +// Timeout when waiting to decide between PINCH and TWODRAG (ms) +const GH_TWOTOUCH_TIMEOUT = 50; + +export default class GestureHandler { + constructor() { + this._target = null; + + this._state = GH_INITSTATE; + + this._tracked = []; + this._ignored = []; + + this._waitingRelease = false; + this._releaseStart = 0.0; + + this._longpressTimeoutId = null; + this._twoTouchTimeoutId = null; + + this._boundEventHandler = this._eventHandler.bind(this); + } + + attach(target) { + this.detach(); + + this._target = target; + this._target.addEventListener('touchstart', + this._boundEventHandler); + this._target.addEventListener('touchmove', + this._boundEventHandler); + this._target.addEventListener('touchend', + this._boundEventHandler); + this._target.addEventListener('touchcancel', + this._boundEventHandler); + } + + detach() { + if (!this._target) { + return; + } + + this._stopLongpressTimeout(); + this._stopTwoTouchTimeout(); + + this._target.removeEventListener('touchstart', + this._boundEventHandler); + this._target.removeEventListener('touchmove', + this._boundEventHandler); + this._target.removeEventListener('touchend', + this._boundEventHandler); + this._target.removeEventListener('touchcancel', + this._boundEventHandler); + this._target = null; + } + + _eventHandler(e) { + let fn; + + e.stopPropagation(); + e.preventDefault(); + + switch (e.type) { + case 'touchstart': + fn = this._touchStart; + break; + case 'touchmove': + fn = this._touchMove; + break; + case 'touchend': + case 'touchcancel': + fn = this._touchEnd; + break; + } + + for (let i = 0; i < e.changedTouches.length; i++) { + let touch = e.changedTouches[i]; + fn.call(this, touch.identifier, touch.clientX, touch.clientY); + } + } + + _touchStart(id, x, y) { + // Ignore any new touches if there is already an active gesture, + // or we're in a cleanup state + if (this._hasDetectedGesture() || (this._state === GH_NOGESTURE)) { + this._ignored.push(id); + return; + } + + // Did it take too long between touches that we should no longer + // consider this a single gesture? + if ((this._tracked.length > 0) && + ((Date.now() - this._tracked[0].started) > GH_MULTITOUCH_TIMEOUT)) { + this._state = GH_NOGESTURE; + this._ignored.push(id); + return; + } + + // If we're waiting for fingers to release then we should no longer + // recognize new touches + if (this._waitingRelease) { + this._state = GH_NOGESTURE; + this._ignored.push(id); + return; + } + + this._tracked.push({ + id: id, + started: Date.now(), + active: true, + firstX: x, + firstY: y, + lastX: x, + lastY: y, + angle: 0 + }); + + switch (this._tracked.length) { + case 1: + this._startLongpressTimeout(); + break; + + case 2: + this._state &= ~(GH_ONETAP | GH_DRAG | GH_LONGPRESS); + this._stopLongpressTimeout(); + break; + + case 3: + this._state &= ~(GH_TWOTAP | GH_TWODRAG | GH_PINCH); + break; + + default: + this._state = GH_NOGESTURE; + } + } + + _touchMove(id, x, y) { + let touch = this._tracked.find(t => t.id === id); + + // If this is an update for a touch we're not tracking, ignore it + if (touch === undefined) { + return; + } + + // Update the touches last position with the event coordinates + touch.lastX = x; + touch.lastY = y; + + let deltaX = x - touch.firstX; + let deltaY = y - touch.firstY; + + // Update angle when the touch has moved + if ((touch.firstX !== touch.lastX) || + (touch.firstY !== touch.lastY)) { + touch.angle = Math.atan2(deltaY, deltaX) * 180 / Math.PI; + } + + if (!this._hasDetectedGesture()) { + // Ignore moves smaller than the minimum threshold + if (Math.hypot(deltaX, deltaY) < GH_MOVE_THRESHOLD) { + return; + } + + // Can't be a tap or long press as we've seen movement + this._state &= ~(GH_ONETAP | GH_TWOTAP | GH_THREETAP | GH_LONGPRESS); + this._stopLongpressTimeout(); + + if (this._tracked.length !== 1) { + this._state &= ~(GH_DRAG); + } + if (this._tracked.length !== 2) { + this._state &= ~(GH_TWODRAG | GH_PINCH); + } + + // We need to figure out which of our different two touch gestures + // this might be + if (this._tracked.length === 2) { + + // The other touch is the one where the id doesn't match + let prevTouch = this._tracked.find(t => t.id !== id); + + // How far the previous touch point has moved since start + let prevDeltaMove = Math.hypot(prevTouch.firstX - prevTouch.lastX, + prevTouch.firstY - prevTouch.lastY); + + // We know that the current touch moved far enough, + // but unless both touches moved further than their + // threshold we don't want to disqualify any gestures + if (prevDeltaMove > GH_MOVE_THRESHOLD) { + + // The angle difference between the direction of the touch points + let deltaAngle = Math.abs(touch.angle - prevTouch.angle); + deltaAngle = Math.abs(((deltaAngle + 180) % 360) - 180); + + // PINCH or TWODRAG can be eliminated depending on the angle + if (deltaAngle > GH_ANGLE_THRESHOLD) { + this._state &= ~GH_TWODRAG; + } else { + this._state &= ~GH_PINCH; + } + + if (this._isTwoTouchTimeoutRunning()) { + this._stopTwoTouchTimeout(); + } + } else if (!this._isTwoTouchTimeoutRunning()) { + // We can't determine the gesture right now, let's + // wait and see if more events are on their way + this._startTwoTouchTimeout(); + } + } + + if (!this._hasDetectedGesture()) { + return; + } + + this._pushEvent('gesturestart'); + } + + this._pushEvent('gesturemove'); + } + + _touchEnd(id, x, y) { + // Check if this is an ignored touch + if (this._ignored.indexOf(id) !== -1) { + // Remove this touch from ignored + this._ignored.splice(this._ignored.indexOf(id), 1); + + // And reset the state if there are no more touches + if ((this._ignored.length === 0) && + (this._tracked.length === 0)) { + this._state = GH_INITSTATE; + this._waitingRelease = false; + } + return; + } + + // We got a touchend before the timer triggered, + // this cannot result in a gesture anymore. + if (!this._hasDetectedGesture() && + this._isTwoTouchTimeoutRunning()) { + this._stopTwoTouchTimeout(); + this._state = GH_NOGESTURE; + } + + // Some gestures don't trigger until a touch is released + if (!this._hasDetectedGesture()) { + // Can't be a gesture that relies on movement + this._state &= ~(GH_DRAG | GH_TWODRAG | GH_PINCH); + // Or something that relies on more time + this._state &= ~GH_LONGPRESS; + this._stopLongpressTimeout(); + + if (!this._waitingRelease) { + this._releaseStart = Date.now(); + this._waitingRelease = true; + + // Can't be a tap that requires more touches than we current have + switch (this._tracked.length) { + case 1: + this._state &= ~(GH_TWOTAP | GH_THREETAP); + break; + + case 2: + this._state &= ~(GH_ONETAP | GH_THREETAP); + break; + } + } + } + + // Waiting for all touches to release? (i.e. some tap) + if (this._waitingRelease) { + // Were all touches released at roughly the same time? + if ((Date.now() - this._releaseStart) > GH_MULTITOUCH_TIMEOUT) { + this._state = GH_NOGESTURE; + } + + // Did too long time pass between press and release? + if (this._tracked.some(t => (Date.now() - t.started) > GH_TAP_TIMEOUT)) { + this._state = GH_NOGESTURE; + } + + let touch = this._tracked.find(t => t.id === id); + touch.active = false; + + // Are we still waiting for more releases? + if (this._hasDetectedGesture()) { + this._pushEvent('gesturestart'); + } else { + // Have we reached a dead end? + if (this._state !== GH_NOGESTURE) { + return; + } + } + } + + if (this._hasDetectedGesture()) { + this._pushEvent('gestureend'); + } + + // Ignore any remaining touches until they are ended + for (let i = 0; i < this._tracked.length; i++) { + if (this._tracked[i].active) { + this._ignored.push(this._tracked[i].id); + } + } + this._tracked = []; + + this._state = GH_NOGESTURE; + + // Remove this touch from ignored if it's in there + if (this._ignored.indexOf(id) !== -1) { + this._ignored.splice(this._ignored.indexOf(id), 1); + } + + // We reset the state if ignored is empty + if ((this._ignored.length === 0)) { + this._state = GH_INITSTATE; + this._waitingRelease = false; + } + } + + _hasDetectedGesture() { + if (this._state === GH_NOGESTURE) { + return false; + } + // Check to see if the bitmask value is a power of 2 + // (i.e. only one bit set). If it is, we have a state. + if (this._state & (this._state - 1)) { + return false; + } + + // For taps we also need to have all touches released + // before we've fully detected the gesture + if (this._state & (GH_ONETAP | GH_TWOTAP | GH_THREETAP)) { + if (this._tracked.some(t => t.active)) { + return false; + } + } + + return true; + } + + _startLongpressTimeout() { + this._stopLongpressTimeout(); + this._longpressTimeoutId = setTimeout(() => this._longpressTimeout(), + GH_LONGPRESS_TIMEOUT); + } + + _stopLongpressTimeout() { + clearTimeout(this._longpressTimeoutId); + this._longpressTimeoutId = null; + } + + _longpressTimeout() { + if (this._hasDetectedGesture()) { + throw new Error("A longpress gesture failed, conflict with a different gesture"); + } + + this._state = GH_LONGPRESS; + this._pushEvent('gesturestart'); + } + + _startTwoTouchTimeout() { + this._stopTwoTouchTimeout(); + this._twoTouchTimeoutId = setTimeout(() => this._twoTouchTimeout(), + GH_TWOTOUCH_TIMEOUT); + } + + _stopTwoTouchTimeout() { + clearTimeout(this._twoTouchTimeoutId); + this._twoTouchTimeoutId = null; + } + + _isTwoTouchTimeoutRunning() { + return this._twoTouchTimeoutId !== null; + } + + _twoTouchTimeout() { + if (this._tracked.length === 0) { + throw new Error("A pinch or two drag gesture failed, no tracked touches"); + } + + // How far each touch point has moved since start + let avgM = this._getAverageMovement(); + let avgMoveH = Math.abs(avgM.x); + let avgMoveV = Math.abs(avgM.y); + + // The difference in the distance between where + // the touch points started and where they are now + let avgD = this._getAverageDistance(); + let deltaTouchDistance = Math.abs(Math.hypot(avgD.first.x, avgD.first.y) - + Math.hypot(avgD.last.x, avgD.last.y)); + + if ((avgMoveV < deltaTouchDistance) && + (avgMoveH < deltaTouchDistance)) { + this._state = GH_PINCH; + } else { + this._state = GH_TWODRAG; + } + + this._pushEvent('gesturestart'); + this._pushEvent('gesturemove'); + } + + _pushEvent(type) { + let detail = { type: this._stateToGesture(this._state) }; + + // For most gesture events the current (average) position is the + // most useful + let avg = this._getPosition(); + let pos = avg.last; + + // However we have a slight distance to detect gestures, so for the + // first gesture event we want to use the first positions we saw + if (type === 'gesturestart') { + pos = avg.first; + } + + // For these gestures, we always want the event coordinates + // to be where the gesture began, not the current touch location. + switch (this._state) { + case GH_TWODRAG: + case GH_PINCH: + pos = avg.first; + break; + } + + detail['clientX'] = pos.x; + detail['clientY'] = pos.y; + + // FIXME: other coordinates? + + // Some gestures also have a magnitude + if (this._state === GH_PINCH) { + let distance = this._getAverageDistance(); + if (type === 'gesturestart') { + detail['magnitudeX'] = distance.first.x; + detail['magnitudeY'] = distance.first.y; + } else { + detail['magnitudeX'] = distance.last.x; + detail['magnitudeY'] = distance.last.y; + } + } else if (this._state === GH_TWODRAG) { + if (type === 'gesturestart') { + detail['magnitudeX'] = 0.0; + detail['magnitudeY'] = 0.0; + } else { + let movement = this._getAverageMovement(); + detail['magnitudeX'] = movement.x; + detail['magnitudeY'] = movement.y; + } + } + + let gev = new CustomEvent(type, { detail: detail }); + this._target.dispatchEvent(gev); + } + + _stateToGesture(state) { + switch (state) { + case GH_ONETAP: + return 'onetap'; + case GH_TWOTAP: + return 'twotap'; + case GH_THREETAP: + return 'threetap'; + case GH_DRAG: + return 'drag'; + case GH_LONGPRESS: + return 'longpress'; + case GH_TWODRAG: + return 'twodrag'; + case GH_PINCH: + return 'pinch'; + } + + throw new Error("Unknown gesture state: " + state); + } + + _getPosition() { + if (this._tracked.length === 0) { + throw new Error("Failed to get gesture position, no tracked touches"); + } + + let size = this._tracked.length; + let fx = 0, fy = 0, lx = 0, ly = 0; + + for (let i = 0; i < this._tracked.length; i++) { + fx += this._tracked[i].firstX; + fy += this._tracked[i].firstY; + lx += this._tracked[i].lastX; + ly += this._tracked[i].lastY; + } + + return { first: { x: fx / size, + y: fy / size }, + last: { x: lx / size, + y: ly / size } }; + } + + _getAverageMovement() { + if (this._tracked.length === 0) { + throw new Error("Failed to get gesture movement, no tracked touches"); + } + + let totalH, totalV; + totalH = totalV = 0; + let size = this._tracked.length; + + for (let i = 0; i < this._tracked.length; i++) { + totalH += this._tracked[i].lastX - this._tracked[i].firstX; + totalV += this._tracked[i].lastY - this._tracked[i].firstY; + } + + return { x: totalH / size, + y: totalV / size }; + } + + _getAverageDistance() { + if (this._tracked.length === 0) { + throw new Error("Failed to get gesture distance, no tracked touches"); + } + + // Distance between the first and last tracked touches + + let first = this._tracked[0]; + let last = this._tracked[this._tracked.length - 1]; + + let fdx = Math.abs(last.firstX - first.firstX); + let fdy = Math.abs(last.firstY - first.firstY); + + let ldx = Math.abs(last.lastX - first.lastX); + let ldy = Math.abs(last.lastY - first.lastY); + + return { first: { x: fdx, y: fdy }, + last: { x: ldx, y: ldy } }; + } +} diff --git a/systemvm/agent/noVNC/core/input/keyboard.js b/systemvm/agent/noVNC/core/input/keyboard.js index 9dbc8d6e6ed1..9e6af2ac753e 100644 --- a/systemvm/agent/noVNC/core/input/keyboard.js +++ b/systemvm/agent/noVNC/core/input/keyboard.js @@ -1,6 +1,6 @@ /* * noVNC: HTML5 VNC client - * Copyright (C) 2018 The noVNC Authors + * Copyright (C) 2019 The noVNC Authors * Licensed under MPL 2.0 or any later version (see LICENSE.txt) */ @@ -118,9 +118,7 @@ export default class Keyboard { // We cannot handle keys we cannot track, but we also need // to deal with virtual keyboards which omit key info - // (iOS omits tracking info on keyup events, which forces us to - // special treat that platform here) - if ((code === 'Unidentified') || browser.isIOS()) { + if (code === 'Unidentified') { if (keysym) { // If it's a virtual keyboard then it should be // sufficient to just send press and release right @@ -137,7 +135,7 @@ export default class Keyboard { // keys around a bit to make things more sane for the remote // server. This method is used by RealVNC and TigerVNC (and // possibly others). - if (browser.isMac()) { + if (browser.isMac() || browser.isIOS()) { switch (keysym) { case KeyTable.XK_Super_L: keysym = KeyTable.XK_Alt_L; @@ -164,7 +162,7 @@ export default class Keyboard { // state change events. That gets extra confusing for CapsLock // which toggles on each press, but not on release. So pretend // it was a quick press and release of the button. - if (browser.isMac() && (code === 'CapsLock')) { + if ((browser.isMac() || browser.isIOS()) && (code === 'CapsLock')) { this._sendKeyEvent(KeyTable.XK_Caps_Lock, 'CapsLock', true); this._sendKeyEvent(KeyTable.XK_Caps_Lock, 'CapsLock', false); stopEvent(e); @@ -276,13 +274,28 @@ export default class Keyboard { } // See comment in _handleKeyDown() - if (browser.isMac() && (code === 'CapsLock')) { + if ((browser.isMac() || browser.isIOS()) && (code === 'CapsLock')) { this._sendKeyEvent(KeyTable.XK_Caps_Lock, 'CapsLock', true); this._sendKeyEvent(KeyTable.XK_Caps_Lock, 'CapsLock', false); return; } this._sendKeyEvent(this._keyDownList[code], code, false); + + // Windows has a rather nasty bug where it won't send key + // release events for a Shift button if the other Shift is still + // pressed + if (browser.isWindows() && ((code === 'ShiftLeft') || + (code === 'ShiftRight'))) { + if ('ShiftRight' in this._keyDownList) { + this._sendKeyEvent(this._keyDownList['ShiftRight'], + 'ShiftRight', false); + } + if ('ShiftLeft' in this._keyDownList) { + this._sendKeyEvent(this._keyDownList['ShiftLeft'], + 'ShiftLeft', false); + } + } } _handleAltGrTimeout() { @@ -299,8 +312,11 @@ export default class Keyboard { Log.Debug("<< Keyboard.allKeysUp"); } - // Firefox Alt workaround, see below + // Alt workaround for Firefox on Windows, see below _checkAlt(e) { + if (e.skipCheckAlt) { + return; + } if (e.altKey) { return; } @@ -315,6 +331,7 @@ export default class Keyboard { const event = new KeyboardEvent('keyup', { key: downList[code], code: code }); + event.skipCheckAlt = true; target.dispatchEvent(event); }); } @@ -331,9 +348,10 @@ export default class Keyboard { // Release (key up) if window loses focus window.addEventListener('blur', this._eventHandlers.blur); - // Firefox has broken handling of Alt, so we need to poll as - // best we can for releases (still doesn't prevent the menu - // from popping up though as we can't call preventDefault()) + // Firefox on Windows has broken handling of Alt, so we need to + // poll as best we can for releases (still doesn't prevent the + // menu from popping up though as we can't call + // preventDefault()) if (browser.isWindows() && browser.isFirefox()) { const handler = this._eventHandlers.checkalt; ['mousedown', 'mouseup', 'mousemove', 'wheel', diff --git a/systemvm/agent/noVNC/core/input/mouse.js b/systemvm/agent/noVNC/core/input/mouse.js deleted file mode 100644 index 58a2982a9614..000000000000 --- a/systemvm/agent/noVNC/core/input/mouse.js +++ /dev/null @@ -1,276 +0,0 @@ -/* - * noVNC: HTML5 VNC client - * Copyright (C) 2018 The noVNC Authors - * Licensed under MPL 2.0 or any later version (see LICENSE.txt) - */ - -import * as Log from '../util/logging.js'; -import { isTouchDevice } from '../util/browser.js'; -import { setCapture, stopEvent, getPointerEvent } from '../util/events.js'; - -const WHEEL_STEP = 10; // Delta threshold for a mouse wheel step -const WHEEL_STEP_TIMEOUT = 50; // ms -const WHEEL_LINE_HEIGHT = 19; - -export default class Mouse { - constructor(target) { - this._target = target || document; - - this._doubleClickTimer = null; - this._lastTouchPos = null; - - this._pos = null; - this._wheelStepXTimer = null; - this._wheelStepYTimer = null; - this._accumulatedWheelDeltaX = 0; - this._accumulatedWheelDeltaY = 0; - - this._eventHandlers = { - 'mousedown': this._handleMouseDown.bind(this), - 'mouseup': this._handleMouseUp.bind(this), - 'mousemove': this._handleMouseMove.bind(this), - 'mousewheel': this._handleMouseWheel.bind(this), - 'mousedisable': this._handleMouseDisable.bind(this) - }; - - // ===== PROPERTIES ===== - - this.touchButton = 1; // Button mask (1, 2, 4) for touch devices (0 means ignore clicks) - - // ===== EVENT HANDLERS ===== - - this.onmousebutton = () => {}; // Handler for mouse button click/release - this.onmousemove = () => {}; // Handler for mouse movement - } - - // ===== PRIVATE METHODS ===== - - _resetDoubleClickTimer() { - this._doubleClickTimer = null; - } - - _handleMouseButton(e, down) { - this._updateMousePosition(e); - let pos = this._pos; - - let bmask; - if (e.touches || e.changedTouches) { - // Touch device - - // When two touches occur within 500 ms of each other and are - // close enough together a double click is triggered. - if (down == 1) { - if (this._doubleClickTimer === null) { - this._lastTouchPos = pos; - } else { - clearTimeout(this._doubleClickTimer); - - // When the distance between the two touches is small enough - // force the position of the latter touch to the position of - // the first. - - const xs = this._lastTouchPos.x - pos.x; - const ys = this._lastTouchPos.y - pos.y; - const d = Math.sqrt((xs * xs) + (ys * ys)); - - // The goal is to trigger on a certain physical width, the - // devicePixelRatio brings us a bit closer but is not optimal. - const threshold = 20 * (window.devicePixelRatio || 1); - if (d < threshold) { - pos = this._lastTouchPos; - } - } - this._doubleClickTimer = setTimeout(this._resetDoubleClickTimer.bind(this), 500); - } - bmask = this.touchButton; - // If bmask is set - } else if (e.which) { - /* everything except IE */ - bmask = 1 << e.button; - } else { - /* IE including 9 */ - bmask = (e.button & 0x1) + // Left - (e.button & 0x2) * 2 + // Right - (e.button & 0x4) / 2; // Middle - } - - Log.Debug("onmousebutton " + (down ? "down" : "up") + - ", x: " + pos.x + ", y: " + pos.y + ", bmask: " + bmask); - this.onmousebutton(pos.x, pos.y, down, bmask); - - stopEvent(e); - } - - _handleMouseDown(e) { - // Touch events have implicit capture - if (e.type === "mousedown") { - setCapture(this._target); - } - - this._handleMouseButton(e, 1); - } - - _handleMouseUp(e) { - this._handleMouseButton(e, 0); - } - - // Mouse wheel events are sent in steps over VNC. This means that the VNC - // protocol can't handle a wheel event with specific distance or speed. - // Therefor, if we get a lot of small mouse wheel events we combine them. - _generateWheelStepX() { - - if (this._accumulatedWheelDeltaX < 0) { - this.onmousebutton(this._pos.x, this._pos.y, 1, 1 << 5); - this.onmousebutton(this._pos.x, this._pos.y, 0, 1 << 5); - } else if (this._accumulatedWheelDeltaX > 0) { - this.onmousebutton(this._pos.x, this._pos.y, 1, 1 << 6); - this.onmousebutton(this._pos.x, this._pos.y, 0, 1 << 6); - } - - this._accumulatedWheelDeltaX = 0; - } - - _generateWheelStepY() { - - if (this._accumulatedWheelDeltaY < 0) { - this.onmousebutton(this._pos.x, this._pos.y, 1, 1 << 3); - this.onmousebutton(this._pos.x, this._pos.y, 0, 1 << 3); - } else if (this._accumulatedWheelDeltaY > 0) { - this.onmousebutton(this._pos.x, this._pos.y, 1, 1 << 4); - this.onmousebutton(this._pos.x, this._pos.y, 0, 1 << 4); - } - - this._accumulatedWheelDeltaY = 0; - } - - _resetWheelStepTimers() { - window.clearTimeout(this._wheelStepXTimer); - window.clearTimeout(this._wheelStepYTimer); - this._wheelStepXTimer = null; - this._wheelStepYTimer = null; - } - - _handleMouseWheel(e) { - this._resetWheelStepTimers(); - - this._updateMousePosition(e); - - let dX = e.deltaX; - let dY = e.deltaY; - - // Pixel units unless it's non-zero. - // Note that if deltamode is line or page won't matter since we aren't - // sending the mouse wheel delta to the server anyway. - // The difference between pixel and line can be important however since - // we have a threshold that can be smaller than the line height. - if (e.deltaMode !== 0) { - dX *= WHEEL_LINE_HEIGHT; - dY *= WHEEL_LINE_HEIGHT; - } - - this._accumulatedWheelDeltaX += dX; - this._accumulatedWheelDeltaY += dY; - - // Generate a mouse wheel step event when the accumulated delta - // for one of the axes is large enough. - // Small delta events that do not pass the threshold get sent - // after a timeout. - if (Math.abs(this._accumulatedWheelDeltaX) > WHEEL_STEP) { - this._generateWheelStepX(); - } else { - this._wheelStepXTimer = - window.setTimeout(this._generateWheelStepX.bind(this), - WHEEL_STEP_TIMEOUT); - } - if (Math.abs(this._accumulatedWheelDeltaY) > WHEEL_STEP) { - this._generateWheelStepY(); - } else { - this._wheelStepYTimer = - window.setTimeout(this._generateWheelStepY.bind(this), - WHEEL_STEP_TIMEOUT); - } - - stopEvent(e); - } - - _handleMouseMove(e) { - this._updateMousePosition(e); - this.onmousemove(this._pos.x, this._pos.y); - stopEvent(e); - } - - _handleMouseDisable(e) { - /* - * Stop propagation if inside canvas area - * Note: This is only needed for the 'click' event as it fails - * to fire properly for the target element so we have - * to listen on the document element instead. - */ - if (e.target == this._target) { - stopEvent(e); - } - } - - // Update coordinates relative to target - _updateMousePosition(e) { - e = getPointerEvent(e); - const bounds = this._target.getBoundingClientRect(); - let x; - let y; - // Clip to target bounds - if (e.clientX < bounds.left) { - x = 0; - } else if (e.clientX >= bounds.right) { - x = bounds.width - 1; - } else { - x = e.clientX - bounds.left; - } - if (e.clientY < bounds.top) { - y = 0; - } else if (e.clientY >= bounds.bottom) { - y = bounds.height - 1; - } else { - y = e.clientY - bounds.top; - } - this._pos = {x: x, y: y}; - } - - // ===== PUBLIC METHODS ===== - - grab() { - if (isTouchDevice) { - this._target.addEventListener('touchstart', this._eventHandlers.mousedown); - this._target.addEventListener('touchend', this._eventHandlers.mouseup); - this._target.addEventListener('touchmove', this._eventHandlers.mousemove); - } - this._target.addEventListener('mousedown', this._eventHandlers.mousedown); - this._target.addEventListener('mouseup', this._eventHandlers.mouseup); - this._target.addEventListener('mousemove', this._eventHandlers.mousemove); - this._target.addEventListener('wheel', this._eventHandlers.mousewheel); - - /* Prevent middle-click pasting (see above for why we bind to document) */ - document.addEventListener('click', this._eventHandlers.mousedisable); - - /* preventDefault() on mousedown doesn't stop this event for some - reason so we have to explicitly block it */ - this._target.addEventListener('contextmenu', this._eventHandlers.mousedisable); - } - - ungrab() { - this._resetWheelStepTimers(); - - if (isTouchDevice) { - this._target.removeEventListener('touchstart', this._eventHandlers.mousedown); - this._target.removeEventListener('touchend', this._eventHandlers.mouseup); - this._target.removeEventListener('touchmove', this._eventHandlers.mousemove); - } - this._target.removeEventListener('mousedown', this._eventHandlers.mousedown); - this._target.removeEventListener('mouseup', this._eventHandlers.mouseup); - this._target.removeEventListener('mousemove', this._eventHandlers.mousemove); - this._target.removeEventListener('wheel', this._eventHandlers.mousewheel); - - document.removeEventListener('click', this._eventHandlers.mousedisable); - - this._target.removeEventListener('contextmenu', this._eventHandlers.mousedisable); - } -} diff --git a/systemvm/agent/noVNC/core/input/uskeysym.js b/systemvm/agent/noVNC/core/input/uskeysym.js new file mode 100644 index 000000000000..97c5ae499bdc --- /dev/null +++ b/systemvm/agent/noVNC/core/input/uskeysym.js @@ -0,0 +1,57 @@ +export default { + '1': 0x0031, /* U+0031 DIGIT ONE */ + '2': 0x0032, /* U+0032 DIGIT TWO */ + '3': 0x0033, /* U+0033 DIGIT THREE */ + '4': 0x0034, /* U+0034 DIGIT FOUR */ + '5': 0x0035, /* U+0035 DIGIT FIVE */ + '6': 0x0036, /* U+0036 DIGIT SIX */ + '7': 0x0037, /* U+0037 DIGIT SEVEN */ + '8': 0x0038, /* U+0038 DIGIT EIGHT */ + '9': 0x0039, /* U+0039 DIGIT NINE */ + '0': 0x0030, /* U+0030 DIGIT ZERO */ + + 'a': 0x0061, /* U+0061 LATIN SMALL LETTER A */ + 'b': 0x0062, /* U+0062 LATIN SMALL LETTER B */ + 'c': 0x0063, /* U+0063 LATIN SMALL LETTER C */ + 'd': 0x0064, /* U+0064 LATIN SMALL LETTER D */ + 'e': 0x0065, /* U+0065 LATIN SMALL LETTER E */ + 'f': 0x0066, /* U+0066 LATIN SMALL LETTER F */ + 'g': 0x0067, /* U+0067 LATIN SMALL LETTER G */ + 'h': 0x0068, /* U+0068 LATIN SMALL LETTER H */ + 'i': 0x0069, /* U+0069 LATIN SMALL LETTER I */ + 'j': 0x006a, /* U+006A LATIN SMALL LETTER J */ + 'k': 0x006b, /* U+006B LATIN SMALL LETTER K */ + 'l': 0x006c, /* U+006C LATIN SMALL LETTER L */ + 'm': 0x006d, /* U+006D LATIN SMALL LETTER M */ + 'n': 0x006e, /* U+006E LATIN SMALL LETTER N */ + 'o': 0x006f, /* U+006F LATIN SMALL LETTER O */ + 'p': 0x0070, /* U+0070 LATIN SMALL LETTER P */ + 'q': 0x0071, /* U+0071 LATIN SMALL LETTER Q */ + 'r': 0x0072, /* U+0072 LATIN SMALL LETTER R */ + 's': 0x0073, /* U+0073 LATIN SMALL LETTER S */ + 't': 0x0074, /* U+0074 LATIN SMALL LETTER T */ + 'u': 0x0075, /* U+0075 LATIN SMALL LETTER U */ + 'v': 0x0076, /* U+0076 LATIN SMALL LETTER V */ + 'w': 0x0077, /* U+0077 LATIN SMALL LETTER W */ + 'x': 0x0078, /* U+0078 LATIN SMALL LETTER X */ + 'y': 0x0079, /* U+0079 LATIN SMALL LETTER Y */ + 'z': 0x007a, /* U+007A LATIN SMALL LETTER Z */ + + '`': 0x0060, /* U+0060 GRAVE ACCENT */ + '-': 0x002d, /* U+002D HYPHEN-MINUS */ + '=': 0x003d, /* U+003D EQUALS SIGN */ + + '[': 0x005b, /* U+005B LEFT SQUARE BRACKET */ + ']': 0x005d, /* U+005D RIGHT SQUARE BRACKET */ + '\\': 0x005c, /* U+005C REVERSE SOLIDUS */ + + ';': 0x003b, /* U+003B SEMICOLON */ + '\'': 0x0027, /* U+0027 APOSTROPHE */ + + ',': 0x002c, /* U+002C COMMA */ + '.': 0x002e, /* U+002E FULL STOP */ + '/': 0x002f, /* U+002F SOLIDUS */ + + ' ': 0x0020, /* U+0020 SPACE */ + '\n': 0xff0d +} \ No newline at end of file diff --git a/systemvm/agent/noVNC/core/input/util.js b/systemvm/agent/noVNC/core/input/util.js index f177ef53d36c..1b98040be237 100644 --- a/systemvm/agent/noVNC/core/input/util.js +++ b/systemvm/agent/noVNC/core/input/util.js @@ -1,3 +1,4 @@ +import KeyTable from "./keysym.js"; import keysyms from "./keysymdef.js"; import vkeys from "./vkeys.js"; import fixedkeys from "./fixedkeys.js"; @@ -91,6 +92,8 @@ export function getKey(evt) { // Mozilla isn't fully in sync with the spec yet switch (evt.key) { case 'OS': return 'Meta'; + case 'LaunchMyComputer': return 'LaunchApplication1'; + case 'LaunchCalculator': return 'LaunchApplication2'; } // iOS leaks some OS names @@ -102,9 +105,21 @@ export function getKey(evt) { case 'UIKeyInputEscape': return 'Escape'; } - // IE and Edge have broken handling of AltGraph so we cannot - // trust them for printable characters - if ((evt.key.length !== 1) || (!browser.isIE() && !browser.isEdge())) { + // Broken behaviour in Chrome + if ((evt.key === '\x00') && (evt.code === 'NumpadDecimal')) { + return 'Delete'; + } + + // IE and Edge need special handling, but for everyone else we + // can trust the value provided + if (!browser.isIE() && !browser.isEdge()) { + return evt.key; + } + + // IE and Edge have broken handling of AltGraph so we can only + // trust them for non-printable characters (and unfortunately + // they also specify 'Unidentified' for some problem keys) + if ((evt.key.length !== 1) && (evt.key !== 'Unidentified')) { return evt.key; } } @@ -141,10 +156,39 @@ export function getKeysym(evt) { location = 2; } + // And for Clear + if ((key === 'Clear') && (location === 3)) { + let code = getKeycode(evt); + if (code === 'NumLock') { + location = 0; + } + } + if ((location === undefined) || (location > 3)) { location = 0; } + // The original Meta key now gets confused with the Windows key + // https://bugs.chromium.org/p/chromium/issues/detail?id=1020141 + // https://bugzilla.mozilla.org/show_bug.cgi?id=1232918 + if (key === 'Meta') { + let code = getKeycode(evt); + if (code === 'AltLeft') { + return KeyTable.XK_Meta_L; + } else if (code === 'AltRight') { + return KeyTable.XK_Meta_R; + } + } + + // macOS has Clear instead of NumLock, but the remote system is + // probably not macOS, so lying here is probably best... + if (key === 'Clear') { + let code = getKeycode(evt); + if (code === 'NumLock') { + return KeyTable.XK_Num_Lock; + } + } + return DOMKeyTable[key][location]; } diff --git a/systemvm/agent/noVNC/core/rfb.js b/systemvm/agent/noVNC/core/rfb.js index e40df6659e57..eda1597e6c08 100644 --- a/systemvm/agent/noVNC/core/rfb.js +++ b/systemvm/agent/noVNC/core/rfb.js @@ -1,23 +1,29 @@ /* * noVNC: HTML5 VNC client - * Copyright (C) 2018 The noVNC Authors + * Copyright (C) 2020 The noVNC Authors * Licensed under MPL 2.0 (see LICENSE.txt) * * See README.md for usage and integration instructions. * */ +import { toUnsigned32bit, toSigned32bit } from './util/int.js'; import * as Log from './util/logging.js'; -import { decodeUTF8 } from './util/strings.js'; +import { encodeUTF8, decodeUTF8 } from './util/strings.js'; import { dragThreshold } from './util/browser.js'; +import { clientToElement } from './util/element.js'; +import { setCapture } from './util/events.js'; import EventTargetMixin from './util/eventtarget.js'; import Display from "./display.js"; +import Inflator from "./inflator.js"; +import Deflator from "./deflator.js"; import Keyboard from "./input/keyboard.js"; -import Mouse from "./input/mouse.js"; +import GestureHandler from "./input/gesturehandler.js"; import Cursor from "./util/cursor.js"; import Websock from "./websock.js"; import DES from "./des.js"; import KeyTable from "./input/keysym.js"; +import USKeyTable from "./input/uskeysym.js"; import XtScancode from "./input/xtscancodes.js"; import { encodings } from "./encodings.js"; import "./util/polyfill.js"; @@ -33,6 +39,36 @@ import TightPNGDecoder from "./decoders/tightpng.js"; const DISCONNECT_TIMEOUT = 3; const DEFAULT_BACKGROUND = 'rgb(40, 40, 40)'; +// Minimum wait (ms) between two mouse moves +const MOUSE_MOVE_DELAY = 17; + +// Wheel thresholds +const WHEEL_STEP = 50; // Pixels needed for one step +const WHEEL_LINE_HEIGHT = 19; // Assumed pixels for one line step + +// Gesture thresholds +const GESTURE_ZOOMSENS = 75; +const GESTURE_SCRLSENS = 50; +const DOUBLE_TAP_TIMEOUT = 1000; +const DOUBLE_TAP_THRESHOLD = 50; + +// Extended clipboard pseudo-encoding formats +const extendedClipboardFormatText = 1; +/*eslint-disable no-unused-vars */ +const extendedClipboardFormatRtf = 1 << 1; +const extendedClipboardFormatHtml = 1 << 2; +const extendedClipboardFormatDib = 1 << 3; +const extendedClipboardFormatFiles = 1 << 4; +/*eslint-enable */ + +// Extended clipboard pseudo-encoding actions +const extendedClipboardActionCaps = 1 << 24; +const extendedClipboardActionRequest = 1 << 25; +const extendedClipboardActionPeek = 1 << 26; +const extendedClipboardActionNotify = 1 << 27; +const extendedClipboardActionProvide = 1 << 28; + + export default class RFB extends EventTargetMixin { constructor(target, url, options) { if (!target) { @@ -49,27 +85,28 @@ export default class RFB extends EventTargetMixin { // Connection details options = options || {}; - this._rfb_credentials = options.credentials || {}; - this._shared = false; + this._rfbCredentials = options.credentials || {}; + this._shared = 'shared' in options ? !!options.shared : true; this._repeaterID = options.repeaterID || ''; - this._showDotCursor = options.showDotCursor || false; + this._wsProtocols = ['binary']; // Internal state - this._rfb_connection_state = ''; - this._rfb_init_state = ''; - this._rfb_auth_scheme = -1; - this._rfb_clean_disconnect = true; + this._rfbConnectionState = ''; + this._rfbInitState = ''; + this._rfbAuthScheme = -1; + this._rfbCleanDisconnect = true; // Server capabilities - this._rfb_version = 0; - this._rfb_max_version = 3.8; - this._rfb_tightvnc = false; - this._rfb_xvp_ver = 0; + this._rfbVersion = 0; + this._rfbMaxVersion = 3.8; + this._rfbTightVNC = false; + this._rfbVeNCryptState = 0; + this._rfbXvpVer = 0; - this._fb_width = 0; - this._fb_height = 0; + this._fbWidth = 0; + this._fbHeight = 0; - this._fb_name = ""; + this._fbName = ""; this._capabilities = { power: false }; @@ -79,21 +116,26 @@ export default class RFB extends EventTargetMixin { this._enabledContinuousUpdates = false; this._supportsSetDesktopSize = false; - this._screen_id = 0; - this._screen_flags = 0; + this._screenID = 0; + this._screenFlags = 0; this._qemuExtKeyEventSupported = false; + this._clipboardText = null; + this._clipboardServerCapabilitiesActions = {}; + this._clipboardServerCapabilitiesFormats = {}; + // Internal objects this._sock = null; // Websock object this._display = null; // Display object this._flushing = false; // Display flushing state this._keyboard = null; // Keyboard input handler object - this._mouse = null; // Mouse input handler object + this._gestures = null; // Gesture input handler object // Timers this._disconnTimer = null; // disconnection timer this._resizeTimeout = null; // resize rate limiting + this._mouseMoveTimer = null; // Decoder states this._decoders = {}; @@ -108,16 +150,28 @@ export default class RFB extends EventTargetMixin { }; // Mouse state - this._mouse_buttonMask = 0; - this._mouse_arr = []; + this._mousePos = {}; + this._mouseButtonMask = 0; + this._mouseLastMoveTime = 0; this._viewportDragging = false; this._viewportDragPos = {}; this._viewportHasMoved = false; + this._accumulatedWheelDeltaX = 0; + this._accumulatedWheelDeltaY = 0; + + // Gesture state + this._gestureLastTapTime = null; + this._gestureFirstDoubleTapEv = null; + this._gestureLastMagnitudeX = 0; + this._gestureLastMagnitudeY = 0; // Bound event handlers this._eventHandlers = { focusCanvas: this._focusCanvas.bind(this), windowResize: this._windowResize.bind(this), + handleMouse: this._handleMouse.bind(this), + handleWheel: this._handleWheel.bind(this), + handleGesture: this._handleGesture.bind(this), }; // main setup @@ -172,27 +226,24 @@ export default class RFB extends EventTargetMixin { throw exc; } this._display.onflush = this._onFlush.bind(this); - this._display.clear(); this._keyboard = new Keyboard(this._canvas); this._keyboard.onkeyevent = this._handleKeyEvent.bind(this); - this._mouse = new Mouse(this._canvas); - this._mouse.onmousebutton = this._handleMouseButton.bind(this); - this._mouse.onmousemove = this._handleMouseMove.bind(this); + this._gestures = new GestureHandler(); this._sock = new Websock(); this._sock.on('message', () => { - this._handle_message(); + this._handleMessage(); }); this._sock.on('open', () => { - if ((this._rfb_connection_state === 'connecting') && - (this._rfb_init_state === '')) { - this._rfb_init_state = 'ProtocolVersion'; + if ((this._rfbConnectionState === 'connecting') && + (this._rfbInitState === '')) { + this._rfbInitState = 'ProtocolVersion'; Log.Debug("Starting VNC handshake"); } else { this._fail("Unexpected server connection while " + - this._rfb_connection_state); + this._rfbConnectionState); } }); this._sock.on('close', (e) => { @@ -205,7 +256,7 @@ export default class RFB extends EventTargetMixin { } msg += ")"; } - switch (this._rfb_connection_state) { + switch (this._rfbConnectionState) { case 'connecting': this._fail("Connection closed " + msg); break; @@ -246,6 +297,15 @@ export default class RFB extends EventTargetMixin { this._clipViewport = false; this._scaleViewport = false; this._resizeSession = false; + + this._showDotCursor = false; + if (options.showDotCursor !== undefined) { + Log.Warn("Specifying showDotCursor as a RFB constructor argument is deprecated"); + this._showDotCursor = options.showDotCursor; + } + + this._qualityLevel = 6; + this._compressionLevel = 2; } // ===== PROPERTIES ===== @@ -254,22 +314,20 @@ export default class RFB extends EventTargetMixin { set viewOnly(viewOnly) { this._viewOnly = viewOnly; - if (this._rfb_connection_state === "connecting" || - this._rfb_connection_state === "connected") { + if (this._rfbConnectionState === "connecting" || + this._rfbConnectionState === "connected") { if (viewOnly) { this._keyboard.ungrab(); - this._mouse.ungrab(); } else { this._keyboard.grab(); - this._mouse.grab(); } } } get capabilities() { return this._capabilities; } - get touchButton() { return this._mouse.touchButton; } - set touchButton(button) { this._mouse.touchButton = button; } + get touchButton() { return 0; } + set touchButton(button) { Log.Warn("Using old API!"); } get clipViewport() { return this._clipViewport; } set clipViewport(viewport) { @@ -308,6 +366,46 @@ export default class RFB extends EventTargetMixin { get background() { return this._screen.style.background; } set background(cssValue) { this._screen.style.background = cssValue; } + get qualityLevel() { + return this._qualityLevel; + } + set qualityLevel(qualityLevel) { + if (!Number.isInteger(qualityLevel) || qualityLevel < 0 || qualityLevel > 9) { + Log.Error("qualityLevel must be an integer between 0 and 9"); + return; + } + + if (this._qualityLevel === qualityLevel) { + return; + } + + this._qualityLevel = qualityLevel; + + if (this._rfbConnectionState === 'connected') { + this._sendEncodings(); + } + } + + get compressionLevel() { + return this._compressionLevel; + } + set compressionLevel(compressionLevel) { + if (!Number.isInteger(compressionLevel) || compressionLevel < 0 || compressionLevel > 9) { + Log.Error("compressionLevel must be an integer between 0 and 9"); + return; + } + + if (this._compressionLevel === compressionLevel) { + return; + } + + this._compressionLevel = compressionLevel; + + if (this._rfbConnectionState === 'connected') { + this._sendEncodings(); + } + } + // ===== PUBLIC METHODS ===== disconnect() { @@ -318,12 +416,29 @@ export default class RFB extends EventTargetMixin { } sendCredentials(creds) { - this._rfb_credentials = creds; - setTimeout(this._init_msg.bind(this), 0); + this._rfbCredentials = creds; + setTimeout(this._initMsg.bind(this), 0); + } + + sendText(text) { + for (var i = 0; i < text.length; i++) { + const character = text.charAt(i); + var charCode = USKeyTable[character] || false; + if (charCode) { + this.sendKey(charCode, character, true); + this.sendKey(charCode, character, false); + } else { + charCode = text.charCodeAt(i) + this.sendKey(KeyTable.XK_Shift_L, "ShiftLeft", true); + this.sendKey(charCode, character, true); + this.sendKey(charCode, character, false); + this.sendKey(KeyTable.XK_Shift_L, "ShiftLeft", false); + } + } } sendCtrlAltDel() { - if (this._rfb_connection_state !== 'connected' || this._viewOnly) { return; } + if (this._rfbConnectionState !== 'connected' || this._viewOnly) { return; } Log.Info("Sending Ctrl-Alt-Del"); this.sendKey(KeyTable.XK_Control_L, "ControlLeft", true); @@ -359,7 +474,7 @@ export default class RFB extends EventTargetMixin { // Send a key press. If 'down' is not specified then send a down key // followed by an up key. sendKey(keysym, code, down) { - if (this._rfb_connection_state !== 'connected' || this._viewOnly) { return; } + if (this._rfbConnectionState !== 'connected' || this._viewOnly) { return; } if (down === undefined) { this.sendKey(keysym, code, true); @@ -394,8 +509,22 @@ export default class RFB extends EventTargetMixin { } clipboardPasteFrom(text) { - if (this._rfb_connection_state !== 'connected' || this._viewOnly) { return; } - RFB.messages.clientCutText(this._sock, text); + if (this._rfbConnectionState !== 'connected' || this._viewOnly) { return; } + + if (this._clipboardServerCapabilitiesFormats[extendedClipboardFormatText] && + this._clipboardServerCapabilitiesActions[extendedClipboardActionNotify]) { + + this._clipboardText = text; + RFB.messages.extendedClipboardNotify(this._sock, [extendedClipboardFormatText]); + } else { + let data = new Uint8Array(text.length); + for (let i = 0; i < text.length; i++) { + // FIXME: text can have values outside of Latin1/Uint8 + data[i] = text.charCodeAt(i); + } + + RFB.messages.clientCutText(this._sock, data); + } } // ===== PRIVATE METHODS ===== @@ -407,7 +536,7 @@ export default class RFB extends EventTargetMixin { try { // WebSocket.onopen transitions to the RFB init states - this._sock.open(this._url, ['binary']); + this._sock.open(this._url, this._wsProtocols); } catch (e) { if (e.name === 'SyntaxError') { this._fail("Invalid host or port (" + e + ")"); @@ -419,6 +548,8 @@ export default class RFB extends EventTargetMixin { // Make our elements part of the page this._target.appendChild(this._screen); + this._gestures.attach(this._canvas); + this._cursor.attach(this._canvas); this._refreshCursor(); @@ -430,17 +561,44 @@ export default class RFB extends EventTargetMixin { this._canvas.addEventListener("mousedown", this._eventHandlers.focusCanvas); this._canvas.addEventListener("touchstart", this._eventHandlers.focusCanvas); + // Mouse events + this._canvas.addEventListener('mousedown', this._eventHandlers.handleMouse); + this._canvas.addEventListener('mouseup', this._eventHandlers.handleMouse); + this._canvas.addEventListener('mousemove', this._eventHandlers.handleMouse); + // Prevent middle-click pasting (see handler for why we bind to document) + this._canvas.addEventListener('click', this._eventHandlers.handleMouse); + // preventDefault() on mousedown doesn't stop this event for some + // reason so we have to explicitly block it + this._canvas.addEventListener('contextmenu', this._eventHandlers.handleMouse); + + // Wheel events + this._canvas.addEventListener("wheel", this._eventHandlers.handleWheel); + + // Gesture events + this._canvas.addEventListener("gesturestart", this._eventHandlers.handleGesture); + this._canvas.addEventListener("gesturemove", this._eventHandlers.handleGesture); + this._canvas.addEventListener("gestureend", this._eventHandlers.handleGesture); + Log.Debug("<< RFB.connect"); } _disconnect() { Log.Debug(">> RFB.disconnect"); this._cursor.detach(); + this._canvas.removeEventListener("gesturestart", this._eventHandlers.handleGesture); + this._canvas.removeEventListener("gesturemove", this._eventHandlers.handleGesture); + this._canvas.removeEventListener("gestureend", this._eventHandlers.handleGesture); + this._canvas.removeEventListener("wheel", this._eventHandlers.handleWheel); + this._canvas.removeEventListener('mousedown', this._eventHandlers.handleMouse); + this._canvas.removeEventListener('mouseup', this._eventHandlers.handleMouse); + this._canvas.removeEventListener('mousemove', this._eventHandlers.handleMouse); + this._canvas.removeEventListener('click', this._eventHandlers.handleMouse); + this._canvas.removeEventListener('contextmenu', this._eventHandlers.handleMouse); this._canvas.removeEventListener("mousedown", this._eventHandlers.focusCanvas); this._canvas.removeEventListener("touchstart", this._eventHandlers.focusCanvas); window.removeEventListener('resize', this._eventHandlers.windowResize); this._keyboard.ungrab(); - this._mouse.ungrab(); + this._gestures.detach(); this._sock.close(); try { this._target.removeChild(this._screen); @@ -453,15 +611,11 @@ export default class RFB extends EventTargetMixin { } } clearTimeout(this._resizeTimeout); + clearTimeout(this._mouseMoveTimer); Log.Debug("<< RFB.disconnect"); } _focusCanvas(event) { - // Respect earlier handlers' request to not do side-effects - if (event.defaultPrevented) { - return; - } - if (!this.focusOnClick) { return; } @@ -469,6 +623,13 @@ export default class RFB extends EventTargetMixin { this.focus(); } + _setDesktopName(name) { + this._fbName = name; + this.dispatchEvent(new CustomEvent( + "desktopname", + { detail: { name: this._fbName } })); + } + _windowResize(event) { // If the window resized then our screen element might have // as well. Update the viewport dimensions. @@ -491,19 +652,19 @@ export default class RFB extends EventTargetMixin { // Update state of clipping in Display object, and make sure the // configured viewport matches the current screen size _updateClip() { - const cur_clip = this._display.clipViewport; - let new_clip = this._clipViewport; + const curClip = this._display.clipViewport; + let newClip = this._clipViewport; if (this._scaleViewport) { // Disable viewport clipping if we are scaling - new_clip = false; + newClip = false; } - if (cur_clip !== new_clip) { - this._display.clipViewport = new_clip; + if (curClip !== newClip) { + this._display.clipViewport = newClip; } - if (new_clip) { + if (newClip) { // When clipping is enabled, the screen is limited to // the size of the container. const size = this._screenSize(); @@ -536,7 +697,7 @@ export default class RFB extends EventTargetMixin { const size = this._screenSize(); RFB.messages.setDesktopSize(this._sock, Math.floor(size.w), Math.floor(size.h), - this._screen_id, this._screen_flags); + this._screenID, this._screenFlags); Log.Debug('Requested new desktop size: ' + size.w + 'x' + size.h); @@ -568,7 +729,7 @@ export default class RFB extends EventTargetMixin { * disconnected - permanent state */ _updateConnectionState(state) { - const oldstate = this._rfb_connection_state; + const oldstate = this._rfbConnectionState; if (state === oldstate) { Log.Debug("Already in state '" + state + "', ignoring"); @@ -622,7 +783,7 @@ export default class RFB extends EventTargetMixin { // State change actions - this._rfb_connection_state = state; + this._rfbConnectionState = state; Log.Debug("New state '" + state + "', was '" + oldstate + "'."); @@ -656,7 +817,7 @@ export default class RFB extends EventTargetMixin { case 'disconnected': this.dispatchEvent(new CustomEvent( "disconnect", { detail: - { clean: this._rfb_clean_disconnect } })); + { clean: this._rfbCleanDisconnect } })); break; } } @@ -667,7 +828,7 @@ export default class RFB extends EventTargetMixin { * should be logged but not sent to the user interface. */ _fail(details) { - switch (this._rfb_connection_state) { + switch (this._rfbConnectionState) { case 'disconnecting': Log.Error("Failed when disconnecting: " + details); break; @@ -681,7 +842,7 @@ export default class RFB extends EventTargetMixin { Log.Error("RFB failure: " + details); break; } - this._rfb_clean_disconnect = false; //This is sent to the UI + this._rfbCleanDisconnect = false; //This is sent to the UI // Transition to disconnected without waiting for socket to close this._updateConnectionState('disconnecting'); @@ -696,13 +857,13 @@ export default class RFB extends EventTargetMixin { { detail: { capabilities: this._capabilities } })); } - _handle_message() { + _handleMessage() { if (this._sock.rQlen === 0) { - Log.Warn("handle_message called on an empty receive queue"); + Log.Warn("handleMessage called on an empty receive queue"); return; } - switch (this._rfb_connection_state) { + switch (this._rfbConnectionState) { case 'disconnected': Log.Error("Got data while disconnected"); break; @@ -711,7 +872,7 @@ export default class RFB extends EventTargetMixin { if (this._flushing) { break; } - if (!this._normal_msg()) { + if (!this._normalMsg()) { break; } if (this._sock.rQlen === 0) { @@ -720,7 +881,7 @@ export default class RFB extends EventTargetMixin { } break; default: - this._init_msg(); + this._initMsg(); break; } } @@ -729,13 +890,52 @@ export default class RFB extends EventTargetMixin { this.sendKey(keysym, code, down); } - _handleMouseButton(x, y, down, bmask) { - if (down) { - this._mouse_buttonMask |= bmask; - } else { - this._mouse_buttonMask &= ~bmask; + _handleMouse(ev) { + /* + * We don't check connection status or viewOnly here as the + * mouse events might be used to control the viewport + */ + + if (ev.type === 'click') { + /* + * Note: This is only needed for the 'click' event as it fails + * to fire properly for the target element so we have + * to listen on the document element instead. + */ + if (ev.target !== this._canvas) { + return; + } } + // FIXME: if we're in view-only and not dragging, + // should we stop events? + ev.stopPropagation(); + ev.preventDefault(); + + if ((ev.type === 'click') || (ev.type === 'contextmenu')) { + return; + } + + let pos = clientToElement(ev.clientX, ev.clientY, + this._canvas); + + switch (ev.type) { + case 'mousedown': + setCapture(this._canvas); + this._handleMouseButton(pos.x, pos.y, + true, 1 << ev.button); + break; + case 'mouseup': + this._handleMouseButton(pos.x, pos.y, + false, 1 << ev.button); + break; + case 'mousemove': + this._handleMouseMove(pos.x, pos.y); + break; + } + } + + _handleMouseButton(x, y, down, bmask) { if (this.dragViewport) { if (down && !this._viewportDragging) { this._viewportDragging = true; @@ -756,17 +956,24 @@ export default class RFB extends EventTargetMixin { // Otherwise we treat this as a mouse click event. // Send the button down event here, as the button up // event is sent at the end of this function. - RFB.messages.pointerEvent(this._sock, - this._display.absX(x), - this._display.absY(y), - bmask); + this._sendMouse(x, y, bmask); } } - if (this._viewOnly) { return; } // View only, skip mouse events + // Flush waiting move event first + if (this._mouseMoveTimer !== null) { + clearTimeout(this._mouseMoveTimer); + this._mouseMoveTimer = null; + this._sendMouse(x, y, this._mouseButtonMask); + } + + if (down) { + this._mouseButtonMask |= bmask; + } else { + this._mouseButtonMask &= ~bmask; + } - if (this._rfb_connection_state !== 'connected') { return; } - RFB.messages.pointerEvent(this._sock, this._display.absX(x), this._display.absY(y), this._mouse_buttonMask); + this._sendMouse(x, y, this._mouseButtonMask); } _handleMouseMove(x, y) { @@ -786,66 +993,304 @@ export default class RFB extends EventTargetMixin { return; } + this._mousePos = { 'x': x, 'y': y }; + + // Limit many mouse move events to one every MOUSE_MOVE_DELAY ms + if (this._mouseMoveTimer == null) { + + const timeSinceLastMove = Date.now() - this._mouseLastMoveTime; + if (timeSinceLastMove > MOUSE_MOVE_DELAY) { + this._sendMouse(x, y, this._mouseButtonMask); + this._mouseLastMoveTime = Date.now(); + } else { + // Too soon since the latest move, wait the remaining time + this._mouseMoveTimer = setTimeout(() => { + this._handleDelayedMouseMove(); + }, MOUSE_MOVE_DELAY - timeSinceLastMove); + } + } + } + + _handleDelayedMouseMove() { + this._mouseMoveTimer = null; + this._sendMouse(this._mousePos.x, this._mousePos.y, + this._mouseButtonMask); + this._mouseLastMoveTime = Date.now(); + } + + _sendMouse(x, y, mask) { + if (this._rfbConnectionState !== 'connected') { return; } if (this._viewOnly) { return; } // View only, skip mouse events - if (this._rfb_connection_state !== 'connected') { return; } - RFB.messages.pointerEvent(this._sock, this._display.absX(x), this._display.absY(y), this._mouse_buttonMask); + RFB.messages.pointerEvent(this._sock, this._display.absX(x), + this._display.absY(y), mask); + } + + _handleWheel(ev) { + if (this._rfbConnectionState !== 'connected') { return; } + if (this._viewOnly) { return; } // View only, skip mouse events + + ev.stopPropagation(); + ev.preventDefault(); + + let pos = clientToElement(ev.clientX, ev.clientY, + this._canvas); + + let dX = ev.deltaX; + let dY = ev.deltaY; + + // Pixel units unless it's non-zero. + // Note that if deltamode is line or page won't matter since we aren't + // sending the mouse wheel delta to the server anyway. + // The difference between pixel and line can be important however since + // we have a threshold that can be smaller than the line height. + if (ev.deltaMode !== 0) { + dX *= WHEEL_LINE_HEIGHT; + dY *= WHEEL_LINE_HEIGHT; + } + + // Mouse wheel events are sent in steps over VNC. This means that the VNC + // protocol can't handle a wheel event with specific distance or speed. + // Therefor, if we get a lot of small mouse wheel events we combine them. + this._accumulatedWheelDeltaX += dX; + this._accumulatedWheelDeltaY += dY; + + // Generate a mouse wheel step event when the accumulated delta + // for one of the axes is large enough. + if (Math.abs(this._accumulatedWheelDeltaX) >= WHEEL_STEP) { + if (this._accumulatedWheelDeltaX < 0) { + this._handleMouseButton(pos.x, pos.y, true, 1 << 5); + this._handleMouseButton(pos.x, pos.y, false, 1 << 5); + } else if (this._accumulatedWheelDeltaX > 0) { + this._handleMouseButton(pos.x, pos.y, true, 1 << 6); + this._handleMouseButton(pos.x, pos.y, false, 1 << 6); + } + + this._accumulatedWheelDeltaX = 0; + } + if (Math.abs(this._accumulatedWheelDeltaY) >= WHEEL_STEP) { + if (this._accumulatedWheelDeltaY < 0) { + this._handleMouseButton(pos.x, pos.y, true, 1 << 3); + this._handleMouseButton(pos.x, pos.y, false, 1 << 3); + } else if (this._accumulatedWheelDeltaY > 0) { + this._handleMouseButton(pos.x, pos.y, true, 1 << 4); + this._handleMouseButton(pos.x, pos.y, false, 1 << 4); + } + + this._accumulatedWheelDeltaY = 0; + } + } + + _fakeMouseMove(ev, elementX, elementY) { + this._handleMouseMove(elementX, elementY); + this._cursor.move(ev.detail.clientX, ev.detail.clientY); + } + + _handleTapEvent(ev, bmask) { + let pos = clientToElement(ev.detail.clientX, ev.detail.clientY, + this._canvas); + + // If the user quickly taps multiple times we assume they meant to + // hit the same spot, so slightly adjust coordinates + + if ((this._gestureLastTapTime !== null) && + ((Date.now() - this._gestureLastTapTime) < DOUBLE_TAP_TIMEOUT) && + (this._gestureFirstDoubleTapEv.detail.type === ev.detail.type)) { + let dx = this._gestureFirstDoubleTapEv.detail.clientX - ev.detail.clientX; + let dy = this._gestureFirstDoubleTapEv.detail.clientY - ev.detail.clientY; + let distance = Math.hypot(dx, dy); + + if (distance < DOUBLE_TAP_THRESHOLD) { + pos = clientToElement(this._gestureFirstDoubleTapEv.detail.clientX, + this._gestureFirstDoubleTapEv.detail.clientY, + this._canvas); + } else { + this._gestureFirstDoubleTapEv = ev; + } + } else { + this._gestureFirstDoubleTapEv = ev; + } + this._gestureLastTapTime = Date.now(); + + this._fakeMouseMove(this._gestureFirstDoubleTapEv, pos.x, pos.y); + this._handleMouseButton(pos.x, pos.y, true, bmask); + this._handleMouseButton(pos.x, pos.y, false, bmask); + } + + _handleGesture(ev) { + let magnitude; + + let pos = clientToElement(ev.detail.clientX, ev.detail.clientY, + this._canvas); + switch (ev.type) { + case 'gesturestart': + switch (ev.detail.type) { + case 'onetap': + this._handleTapEvent(ev, 0x1); + break; + case 'twotap': + this._handleTapEvent(ev, 0x4); + break; + case 'threetap': + this._handleTapEvent(ev, 0x2); + break; + case 'drag': + this._fakeMouseMove(ev, pos.x, pos.y); + this._handleMouseButton(pos.x, pos.y, true, 0x1); + break; + case 'longpress': + this._fakeMouseMove(ev, pos.x, pos.y); + this._handleMouseButton(pos.x, pos.y, true, 0x4); + break; + + case 'twodrag': + this._gestureLastMagnitudeX = ev.detail.magnitudeX; + this._gestureLastMagnitudeY = ev.detail.magnitudeY; + this._fakeMouseMove(ev, pos.x, pos.y); + break; + case 'pinch': + this._gestureLastMagnitudeX = Math.hypot(ev.detail.magnitudeX, + ev.detail.magnitudeY); + this._fakeMouseMove(ev, pos.x, pos.y); + break; + } + break; + + case 'gesturemove': + switch (ev.detail.type) { + case 'onetap': + case 'twotap': + case 'threetap': + break; + case 'drag': + case 'longpress': + this._fakeMouseMove(ev, pos.x, pos.y); + break; + case 'twodrag': + // Always scroll in the same position. + // We don't know if the mouse was moved so we need to move it + // every update. + this._fakeMouseMove(ev, pos.x, pos.y); + while ((ev.detail.magnitudeY - this._gestureLastMagnitudeY) > GESTURE_SCRLSENS) { + this._handleMouseButton(pos.x, pos.y, true, 0x8); + this._handleMouseButton(pos.x, pos.y, false, 0x8); + this._gestureLastMagnitudeY += GESTURE_SCRLSENS; + } + while ((ev.detail.magnitudeY - this._gestureLastMagnitudeY) < -GESTURE_SCRLSENS) { + this._handleMouseButton(pos.x, pos.y, true, 0x10); + this._handleMouseButton(pos.x, pos.y, false, 0x10); + this._gestureLastMagnitudeY -= GESTURE_SCRLSENS; + } + while ((ev.detail.magnitudeX - this._gestureLastMagnitudeX) > GESTURE_SCRLSENS) { + this._handleMouseButton(pos.x, pos.y, true, 0x20); + this._handleMouseButton(pos.x, pos.y, false, 0x20); + this._gestureLastMagnitudeX += GESTURE_SCRLSENS; + } + while ((ev.detail.magnitudeX - this._gestureLastMagnitudeX) < -GESTURE_SCRLSENS) { + this._handleMouseButton(pos.x, pos.y, true, 0x40); + this._handleMouseButton(pos.x, pos.y, false, 0x40); + this._gestureLastMagnitudeX -= GESTURE_SCRLSENS; + } + break; + case 'pinch': + // Always scroll in the same position. + // We don't know if the mouse was moved so we need to move it + // every update. + this._fakeMouseMove(ev, pos.x, pos.y); + magnitude = Math.hypot(ev.detail.magnitudeX, ev.detail.magnitudeY); + if (Math.abs(magnitude - this._gestureLastMagnitudeX) > GESTURE_ZOOMSENS) { + this._handleKeyEvent(KeyTable.XK_Control_L, "ControlLeft", true); + while ((magnitude - this._gestureLastMagnitudeX) > GESTURE_ZOOMSENS) { + this._handleMouseButton(pos.x, pos.y, true, 0x8); + this._handleMouseButton(pos.x, pos.y, false, 0x8); + this._gestureLastMagnitudeX += GESTURE_ZOOMSENS; + } + while ((magnitude - this._gestureLastMagnitudeX) < -GESTURE_ZOOMSENS) { + this._handleMouseButton(pos.x, pos.y, true, 0x10); + this._handleMouseButton(pos.x, pos.y, false, 0x10); + this._gestureLastMagnitudeX -= GESTURE_ZOOMSENS; + } + } + this._handleKeyEvent(KeyTable.XK_Control_L, "ControlLeft", false); + break; + } + break; + + case 'gestureend': + switch (ev.detail.type) { + case 'onetap': + case 'twotap': + case 'threetap': + case 'pinch': + case 'twodrag': + break; + case 'drag': + this._fakeMouseMove(ev, pos.x, pos.y); + this._handleMouseButton(pos.x, pos.y, false, 0x1); + break; + case 'longpress': + this._fakeMouseMove(ev, pos.x, pos.y); + this._handleMouseButton(pos.x, pos.y, false, 0x4); + break; + } + break; + } } // Message Handlers - _negotiate_protocol_version() { + _negotiateProtocolVersion() { if (this._sock.rQwait("version", 12)) { return false; } const sversion = this._sock.rQshiftStr(12).substr(4, 7); Log.Info("Server ProtocolVersion: " + sversion); - let is_repeater = 0; + let isRepeater = 0; switch (sversion) { case "000.000": // UltraVNC repeater - is_repeater = 1; + isRepeater = 1; break; case "003.003": case "003.006": // UltraVNC case "003.889": // Apple Remote Desktop - this._rfb_version = 3.3; + this._rfbVersion = 3.3; break; case "003.007": - this._rfb_version = 3.7; + this._rfbVersion = 3.7; break; case "003.008": case "004.000": // Intel AMT KVM case "004.001": // RealVNC 4.6 case "005.000": // RealVNC 5.3 - this._rfb_version = 3.8; + this._rfbVersion = 3.8; break; default: return this._fail("Invalid server version " + sversion); } - if (is_repeater) { + if (isRepeater) { let repeaterID = "ID:" + this._repeaterID; while (repeaterID.length < 250) { repeaterID += "\0"; } - this._sock.send_string(repeaterID); + this._sock.sendString(repeaterID); return true; } - if (this._rfb_version > this._rfb_max_version) { - this._rfb_version = this._rfb_max_version; + if (this._rfbVersion > this._rfbMaxVersion) { + this._rfbVersion = this._rfbMaxVersion; } - const cversion = "00" + parseInt(this._rfb_version, 10) + - ".00" + ((this._rfb_version * 10) % 10); - this._sock.send_string("RFB " + cversion + "\n"); + const cversion = "00" + parseInt(this._rfbVersion, 10) + + ".00" + ((this._rfbVersion * 10) % 10); + this._sock.sendString("RFB " + cversion + "\n"); Log.Debug('Sent ProtocolVersion: ' + cversion); - this._rfb_init_state = 'Security'; + this._rfbInitState = 'Security'; } - _negotiate_security() { + _negotiateSecurity() { // Polyfill since IE and PhantomJS doesn't have // TypedArray.includes() function includes(item, array) { @@ -857,55 +1302,57 @@ export default class RFB extends EventTargetMixin { return false; } - if (this._rfb_version >= 3.7) { + if (this._rfbVersion >= 3.7) { // Server sends supported list, client decides - const num_types = this._sock.rQshift8(); - if (this._sock.rQwait("security type", num_types, 1)) { return false; } - - if (num_types === 0) { - this._rfb_init_state = "SecurityReason"; - this._security_context = "no security types"; - this._security_status = 1; - return this._init_msg(); + const numTypes = this._sock.rQshift8(); + if (this._sock.rQwait("security type", numTypes, 1)) { return false; } + + if (numTypes === 0) { + this._rfbInitState = "SecurityReason"; + this._securityContext = "no security types"; + this._securityStatus = 1; + return this._initMsg(); } - const types = this._sock.rQshiftBytes(num_types); + const types = this._sock.rQshiftBytes(numTypes); Log.Debug("Server security types: " + types); // Look for each auth in preferred order if (includes(1, types)) { - this._rfb_auth_scheme = 1; // None + this._rfbAuthScheme = 1; // None } else if (includes(22, types)) { - this._rfb_auth_scheme = 22; // XVP + this._rfbAuthScheme = 22; // XVP } else if (includes(16, types)) { - this._rfb_auth_scheme = 16; // Tight + this._rfbAuthScheme = 16; // Tight } else if (includes(2, types)) { - this._rfb_auth_scheme = 2; // VNC Auth + this._rfbAuthScheme = 2; // VNC Auth + } else if (includes(19, types)) { + this._rfbAuthScheme = 19; // VeNCrypt Auth } else { return this._fail("Unsupported security types (types: " + types + ")"); } - this._sock.send([this._rfb_auth_scheme]); + this._sock.send([this._rfbAuthScheme]); } else { // Server decides if (this._sock.rQwait("security scheme", 4)) { return false; } - this._rfb_auth_scheme = this._sock.rQshift32(); + this._rfbAuthScheme = this._sock.rQshift32(); - if (this._rfb_auth_scheme == 0) { - this._rfb_init_state = "SecurityReason"; - this._security_context = "authentication scheme"; - this._security_status = 1; - return this._init_msg(); + if (this._rfbAuthScheme == 0) { + this._rfbInitState = "SecurityReason"; + this._securityContext = "authentication scheme"; + this._securityStatus = 1; + return this._initMsg(); } } - this._rfb_init_state = 'Authentication'; - Log.Debug('Authenticating using scheme: ' + this._rfb_auth_scheme); + this._rfbInitState = 'Authentication'; + Log.Debug('Authenticating using scheme: ' + this._rfbAuthScheme); - return this._init_msg(); // jump to authentication + return this._initMsg(); // jump to authentication } - _handle_security_reason() { + _handleSecurityReason() { if (this._sock.rQwait("reason length", 4)) { return false; } @@ -920,46 +1367,134 @@ export default class RFB extends EventTargetMixin { if (reason !== "") { this.dispatchEvent(new CustomEvent( "securityfailure", - { detail: { status: this._security_status, + { detail: { status: this._securityStatus, reason: reason } })); return this._fail("Security negotiation failed on " + - this._security_context + + this._securityContext + " (reason: " + reason + ")"); } else { this.dispatchEvent(new CustomEvent( "securityfailure", - { detail: { status: this._security_status } })); + { detail: { status: this._securityStatus } })); return this._fail("Security negotiation failed on " + - this._security_context); + this._securityContext); } } // authentication - _negotiate_xvp_auth() { - if (!this._rfb_credentials.username || - !this._rfb_credentials.password || - !this._rfb_credentials.target) { + _negotiateXvpAuth() { + if (this._rfbCredentials.username === undefined || + this._rfbCredentials.password === undefined || + this._rfbCredentials.target === undefined) { this.dispatchEvent(new CustomEvent( "credentialsrequired", { detail: { types: ["username", "password", "target"] } })); return false; } - const xvp_auth_str = String.fromCharCode(this._rfb_credentials.username.length) + - String.fromCharCode(this._rfb_credentials.target.length) + - this._rfb_credentials.username + - this._rfb_credentials.target; - this._sock.send_string(xvp_auth_str); - this._rfb_auth_scheme = 2; - return this._negotiate_authentication(); + const xvpAuthStr = String.fromCharCode(this._rfbCredentials.username.length) + + String.fromCharCode(this._rfbCredentials.target.length) + + this._rfbCredentials.username + + this._rfbCredentials.target; + this._sock.sendString(xvpAuthStr); + this._rfbAuthScheme = 2; + return this._negotiateAuthentication(); } - _negotiate_std_vnc_auth() { + // VeNCrypt authentication, currently only supports version 0.2 and only Plain subtype + _negotiateVeNCryptAuth() { + + // waiting for VeNCrypt version + if (this._rfbVeNCryptState == 0) { + if (this._sock.rQwait("vencrypt version", 2)) { return false; } + + const major = this._sock.rQshift8(); + const minor = this._sock.rQshift8(); + + if (!(major == 0 && minor == 2)) { + return this._fail("Unsupported VeNCrypt version " + major + "." + minor); + } + + this._sock.send([0, 2]); + this._rfbVeNCryptState = 1; + } + + // waiting for ACK + if (this._rfbVeNCryptState == 1) { + if (this._sock.rQwait("vencrypt ack", 1)) { return false; } + + const res = this._sock.rQshift8(); + + if (res != 0) { + return this._fail("VeNCrypt failure " + res); + } + + this._rfbVeNCryptState = 2; + } + // must fall through here (i.e. no "else if"), beacause we may have already received + // the subtypes length and won't be called again + + if (this._rfbVeNCryptState == 2) { // waiting for subtypes length + if (this._sock.rQwait("vencrypt subtypes length", 1)) { return false; } + + const subtypesLength = this._sock.rQshift8(); + if (subtypesLength < 1) { + return this._fail("VeNCrypt subtypes empty"); + } + + this._rfbVeNCryptSubtypesLength = subtypesLength; + this._rfbVeNCryptState = 3; + } + + // waiting for subtypes list + if (this._rfbVeNCryptState == 3) { + if (this._sock.rQwait("vencrypt subtypes", 4 * this._rfbVeNCryptSubtypesLength)) { return false; } + + const subtypes = []; + for (let i = 0; i < this._rfbVeNCryptSubtypesLength; i++) { + subtypes.push(this._sock.rQshift32()); + } + + // 256 = Plain subtype + if (subtypes.indexOf(256) != -1) { + // 0x100 = 256 + this._sock.send([0, 0, 1, 0]); + this._rfbVeNCryptState = 4; + } else { + return this._fail("VeNCrypt Plain subtype not offered by server"); + } + } + + // negotiated Plain subtype, server waits for password + if (this._rfbVeNCryptState == 4) { + if (!this._rfbCredentials.username || + !this._rfbCredentials.password) { + this.dispatchEvent(new CustomEvent( + "credentialsrequired", + { detail: { types: ["username", "password"] } })); + return false; + } + + const user = encodeUTF8(this._rfbCredentials.username); + const pass = encodeUTF8(this._rfbCredentials.password); + + // XXX we assume lengths are <= 255 (should not be an issue in the real world) + this._sock.send([0, 0, 0, user.length]); + this._sock.send([0, 0, 0, pass.length]); + this._sock.sendString(user); + this._sock.sendString(pass); + + this._rfbInitState = "SecurityResult"; + return true; + } + } + + _negotiateStdVNCAuth() { if (this._sock.rQwait("auth challenge", 16)) { return false; } - if (!this._rfb_credentials.password) { + if (this._rfbCredentials.password === undefined) { this.dispatchEvent(new CustomEvent( "credentialsrequired", { detail: { types: ["password"] } })); @@ -968,23 +1503,40 @@ export default class RFB extends EventTargetMixin { // TODO(directxman12): make genDES not require an Array const challenge = Array.prototype.slice.call(this._sock.rQshiftBytes(16)); - const response = RFB.genDES(this._rfb_credentials.password, challenge); + const response = RFB.genDES(this._rfbCredentials.password, challenge); this._sock.send(response); - this._rfb_init_state = "SecurityResult"; + this._rfbInitState = "SecurityResult"; + return true; + } + + _negotiateTightUnixAuth() { + if (this._rfbCredentials.username === undefined || + this._rfbCredentials.password === undefined) { + this.dispatchEvent(new CustomEvent( + "credentialsrequired", + { detail: { types: ["username", "password"] } })); + return false; + } + + this._sock.send([0, 0, 0, this._rfbCredentials.username.length]); + this._sock.send([0, 0, 0, this._rfbCredentials.password.length]); + this._sock.sendString(this._rfbCredentials.username); + this._sock.sendString(this._rfbCredentials.password); + this._rfbInitState = "SecurityResult"; return true; } - _negotiate_tight_tunnels(numTunnels) { + _negotiateTightTunnels(numTunnels) { const clientSupportedTunnelTypes = { 0: { vendor: 'TGHT', signature: 'NOTUNNEL' } }; const serverSupportedTunnelTypes = {}; // receive tunnel capabilities for (let i = 0; i < numTunnels; i++) { - const cap_code = this._sock.rQshift32(); - const cap_vendor = this._sock.rQshiftStr(4); - const cap_signature = this._sock.rQshiftStr(8); - serverSupportedTunnelTypes[cap_code] = { vendor: cap_vendor, signature: cap_signature }; + const capCode = this._sock.rQshift32(); + const capVendor = this._sock.rQshiftStr(4); + const capSignature = this._sock.rQshiftStr(8); + serverSupportedTunnelTypes[capCode] = { vendor: capVendor, signature: capSignature }; } Log.Debug("Server Tight tunnel types: " + serverSupportedTunnelTypes); @@ -1015,16 +1567,16 @@ export default class RFB extends EventTargetMixin { } } - _negotiate_tight_auth() { - if (!this._rfb_tightvnc) { // first pass, do the tunnel negotiation + _negotiateTightAuth() { + if (!this._rfbTightVNC) { // first pass, do the tunnel negotiation if (this._sock.rQwait("num tunnels", 4)) { return false; } const numTunnels = this._sock.rQshift32(); if (numTunnels > 0 && this._sock.rQwait("tunnel capabilities", 16 * numTunnels, 4)) { return false; } - this._rfb_tightvnc = true; + this._rfbTightVNC = true; if (numTunnels > 0) { - this._negotiate_tight_tunnels(numTunnels); + this._negotiateTightTunnels(numTunnels); return false; // wait until we receive the sub auth to continue } } @@ -1033,7 +1585,7 @@ export default class RFB extends EventTargetMixin { if (this._sock.rQwait("sub auth count", 4)) { return false; } const subAuthCount = this._sock.rQshift32(); if (subAuthCount === 0) { // empty sub-auth list received means 'no auth' subtype selected - this._rfb_init_state = 'SecurityResult'; + this._rfbInitState = 'SecurityResult'; return true; } @@ -1041,7 +1593,8 @@ export default class RFB extends EventTargetMixin { const clientSupportedTypes = { 'STDVNOAUTH__': 1, - 'STDVVNCAUTH_': 2 + 'STDVVNCAUTH_': 2, + 'TGHTULGNAUTH': 129 }; const serverSupportedTypes = []; @@ -1061,11 +1614,14 @@ export default class RFB extends EventTargetMixin { switch (authType) { case 'STDVNOAUTH__': // no auth - this._rfb_init_state = 'SecurityResult'; + this._rfbInitState = 'SecurityResult'; return true; case 'STDVVNCAUTH_': // VNC auth - this._rfb_auth_scheme = 2; - return this._init_msg(); + this._rfbAuthScheme = 2; + return this._initMsg(); + case 'TGHTULGNAUTH': // UNIX auth + this._rfbAuthScheme = 129; + return this._initMsg(); default: return this._fail("Unsupported tiny auth scheme " + "(scheme: " + authType + ")"); @@ -1076,46 +1632,52 @@ export default class RFB extends EventTargetMixin { return this._fail("No supported sub-auth types!"); } - _negotiate_authentication() { - switch (this._rfb_auth_scheme) { + _negotiateAuthentication() { + switch (this._rfbAuthScheme) { case 1: // no auth - if (this._rfb_version >= 3.8) { - this._rfb_init_state = 'SecurityResult'; + if (this._rfbVersion >= 3.8) { + this._rfbInitState = 'SecurityResult'; return true; } - this._rfb_init_state = 'ClientInitialisation'; - return this._init_msg(); + this._rfbInitState = 'ClientInitialisation'; + return this._initMsg(); case 22: // XVP auth - return this._negotiate_xvp_auth(); + return this._negotiateXvpAuth(); case 2: // VNC authentication - return this._negotiate_std_vnc_auth(); + return this._negotiateStdVNCAuth(); case 16: // TightVNC Security Type - return this._negotiate_tight_auth(); + return this._negotiateTightAuth(); + + case 19: // VeNCrypt Security Type + return this._negotiateVeNCryptAuth(); + + case 129: // TightVNC UNIX Security Type + return this._negotiateTightUnixAuth(); default: return this._fail("Unsupported auth scheme (scheme: " + - this._rfb_auth_scheme + ")"); + this._rfbAuthScheme + ")"); } } - _handle_security_result() { + _handleSecurityResult() { if (this._sock.rQwait('VNC auth response ', 4)) { return false; } const status = this._sock.rQshift32(); if (status === 0) { // OK - this._rfb_init_state = 'ClientInitialisation'; + this._rfbInitState = 'ClientInitialisation'; Log.Debug('Authentication OK'); - return this._init_msg(); + return this._initMsg(); } else { - if (this._rfb_version >= 3.8) { - this._rfb_init_state = "SecurityReason"; - this._security_context = "security result"; - this._security_status = status; - return this._init_msg(); + if (this._rfbVersion >= 3.8) { + this._rfbInitState = "SecurityReason"; + this._securityContext = "security result"; + this._securityStatus = status; + return this._initMsg(); } else { this.dispatchEvent(new CustomEvent( "securityfailure", @@ -1126,7 +1688,7 @@ export default class RFB extends EventTargetMixin { } } - _negotiate_server_init() { + _negotiateServerInit() { if (this._sock.rQwait("server initialization", 24)) { return false; } /* Screen size */ @@ -1136,27 +1698,28 @@ export default class RFB extends EventTargetMixin { /* PIXEL_FORMAT */ const bpp = this._sock.rQshift8(); const depth = this._sock.rQshift8(); - const big_endian = this._sock.rQshift8(); - const true_color = this._sock.rQshift8(); - - const red_max = this._sock.rQshift16(); - const green_max = this._sock.rQshift16(); - const blue_max = this._sock.rQshift16(); - const red_shift = this._sock.rQshift8(); - const green_shift = this._sock.rQshift8(); - const blue_shift = this._sock.rQshift8(); + const bigEndian = this._sock.rQshift8(); + const trueColor = this._sock.rQshift8(); + + const redMax = this._sock.rQshift16(); + const greenMax = this._sock.rQshift16(); + const blueMax = this._sock.rQshift16(); + const redShift = this._sock.rQshift8(); + const greenShift = this._sock.rQshift8(); + const blueShift = this._sock.rQshift8(); this._sock.rQskipBytes(3); // padding // NB(directxman12): we don't want to call any callbacks or print messages until // *after* we're past the point where we could backtrack /* Connection name/title */ - const name_length = this._sock.rQshift32(); - if (this._sock.rQwait('server init name', name_length, 24)) { return false; } - this._fb_name = decodeUTF8(this._sock.rQshiftStr(name_length)); + const nameLength = this._sock.rQshift32(); + if (this._sock.rQwait('server init name', nameLength, 24)) { return false; } + let name = this._sock.rQshiftStr(nameLength); + name = decodeUTF8(name, true); - if (this._rfb_tightvnc) { - if (this._sock.rQwait('TightVNC extended server init header', 8, 24 + name_length)) { return false; } + if (this._rfbTightVNC) { + if (this._sock.rQwait('TightVNC extended server init header', 8, 24 + nameLength)) { return false; } // In TightVNC mode, ServerInit message is extended const numServerMessages = this._sock.rQshift16(); const numClientMessages = this._sock.rQshift16(); @@ -1164,7 +1727,7 @@ export default class RFB extends EventTargetMixin { this._sock.rQskipBytes(2); // padding const totalMessagesLength = (numServerMessages + numClientMessages + numEncodings) * 16; - if (this._sock.rQwait('TightVNC extended server init header', totalMessagesLength, 32 + name_length)) { return false; } + if (this._sock.rQwait('TightVNC extended server init header', totalMessagesLength, 32 + nameLength)) { return false; } // we don't actually do anything with the capability information that TIGHT sends, // so we just skip the all of this. @@ -1183,42 +1746,31 @@ export default class RFB extends EventTargetMixin { // if we backtrack Log.Info("Screen: " + width + "x" + height + ", bpp: " + bpp + ", depth: " + depth + - ", big_endian: " + big_endian + - ", true_color: " + true_color + - ", red_max: " + red_max + - ", green_max: " + green_max + - ", blue_max: " + blue_max + - ", red_shift: " + red_shift + - ", green_shift: " + green_shift + - ", blue_shift: " + blue_shift); - - if (big_endian !== 0) { - Log.Warn("Server native endian is not little endian"); - } - - if (red_shift !== 16) { - Log.Warn("Server native red-shift is not 16"); - } - - if (blue_shift !== 0) { - Log.Warn("Server native blue-shift is not 0"); - } - + ", bigEndian: " + bigEndian + + ", trueColor: " + trueColor + + ", redMax: " + redMax + + ", greenMax: " + greenMax + + ", blueMax: " + blueMax + + ", redShift: " + redShift + + ", greenShift: " + greenShift + + ", blueShift: " + blueShift); + + // we're past the point where we could backtrack, so it's safe to call this + this._setDesktopName(name); this._resize(width, height); if (!this._viewOnly) { this._keyboard.grab(); } - if (!this._viewOnly) { this._mouse.grab(); } - this._fb_depth = 24; + this._fbDepth = 24; - if (this._fb_name === "Intel(r) AMT KVM") { + if (this._fbName === "Intel(r) AMT KVM") { Log.Warn("Intel AMT KVM only supports 8/16 bit depths. Using low color mode."); - this._fb_depth = 8; + this._fbDepth = 8; } - RFB.messages.pixelFormat(this._sock, this._fb_depth, true); + RFB.messages.pixelFormat(this._sock, this._fbDepth, true); this._sendEncodings(); - RFB.messages.fbUpdateRequest(this._sock, false, 0, 0, this._fb_width, this._fb_height); + RFB.messages.fbUpdateRequest(this._sock, false, 0, 0, this._fbWidth, this._fbHeight); this._updateConnectionState('connected'); return true; @@ -1230,7 +1782,7 @@ export default class RFB extends EventTargetMixin { // In preference order encs.push(encodings.encodingCopyRect); // Only supported with full depth support - if (this._fb_depth == 24) { + if (this._fbDepth == 24) { encs.push(encodings.encodingTight); encs.push(encodings.encodingTightPNG); encs.push(encodings.encodingHextile); @@ -1239,8 +1791,8 @@ export default class RFB extends EventTargetMixin { encs.push(encodings.encodingRaw); // Psuedo-encoding settings - encs.push(encodings.pseudoEncodingQualityLevel0 + 6); - encs.push(encodings.pseudoEncodingCompressLevel0 + 2); + encs.push(encodings.pseudoEncodingQualityLevel0 + this._qualityLevel); + encs.push(encodings.pseudoEncodingCompressLevel0 + this._compressionLevel); encs.push(encodings.pseudoEncodingDesktopSize); encs.push(encodings.pseudoEncodingLastRect); @@ -1249,8 +1801,11 @@ export default class RFB extends EventTargetMixin { encs.push(encodings.pseudoEncodingXvp); encs.push(encodings.pseudoEncodingFence); encs.push(encodings.pseudoEncodingContinuousUpdates); + encs.push(encodings.pseudoEncodingDesktopName); + encs.push(encodings.pseudoEncodingExtendedClipboard); - if (this._fb_depth == 24) { + if (this._fbDepth == 24) { + encs.push(encodings.pseudoEncodingVMwareCursor); encs.push(encodings.pseudoEncodingCursor); } @@ -1265,63 +1820,212 @@ export default class RFB extends EventTargetMixin { * ClientInitialization - not triggered by server message * ServerInitialization */ - _init_msg() { - switch (this._rfb_init_state) { + _initMsg() { + switch (this._rfbInitState) { case 'ProtocolVersion': - return this._negotiate_protocol_version(); + return this._negotiateProtocolVersion(); case 'Security': - return this._negotiate_security(); + return this._negotiateSecurity(); case 'Authentication': - return this._negotiate_authentication(); + return this._negotiateAuthentication(); case 'SecurityResult': - return this._handle_security_result(); + return this._handleSecurityResult(); case 'SecurityReason': - return this._handle_security_reason(); + return this._handleSecurityReason(); case 'ClientInitialisation': - this._sock.send([0]); // ClientInitialisation for exclusive access - this._rfb_init_state = 'ServerInitialisation'; + this._sock.send([this._shared ? 1 : 0]); // ClientInitialisation + this._rfbInitState = 'ServerInitialisation'; return true; case 'ServerInitialisation': - return this._negotiate_server_init(); + return this._negotiateServerInit(); default: return this._fail("Unknown init state (state: " + - this._rfb_init_state + ")"); + this._rfbInitState + ")"); } } - _handle_set_colour_map_msg() { + _handleSetColourMapMsg() { Log.Debug("SetColorMapEntries"); return this._fail("Unexpected SetColorMapEntries message"); } - _handle_server_cut_text() { + _handleServerCutText() { Log.Debug("ServerCutText"); if (this._sock.rQwait("ServerCutText header", 7, 1)) { return false; } + this._sock.rQskipBytes(3); // Padding - const length = this._sock.rQshift32(); - if (this._sock.rQwait("ServerCutText", length, 8)) { return false; } - const text = this._sock.rQshiftStr(length); + let length = this._sock.rQshift32(); + length = toSigned32bit(length); - if (this._viewOnly) { return true; } + if (this._sock.rQwait("ServerCutText content", Math.abs(length), 8)) { return false; } - this.dispatchEvent(new CustomEvent( - "clipboard", - { detail: { text: text } })); + if (length >= 0) { + //Standard msg + const text = this._sock.rQshiftStr(length); + if (this._viewOnly) { + return true; + } + + this.dispatchEvent(new CustomEvent( + "clipboard", + { detail: { text: text } })); + } else { + //Extended msg. + length = Math.abs(length); + const flags = this._sock.rQshift32(); + let formats = flags & 0x0000FFFF; + let actions = flags & 0xFF000000; + + let isCaps = (!!(actions & extendedClipboardActionCaps)); + if (isCaps) { + this._clipboardServerCapabilitiesFormats = {}; + this._clipboardServerCapabilitiesActions = {}; + + // Update our server capabilities for Formats + for (let i = 0; i <= 15; i++) { + let index = 1 << i; + + // Check if format flag is set. + if ((formats & index)) { + this._clipboardServerCapabilitiesFormats[index] = true; + // We don't send unsolicited clipboard, so we + // ignore the size + this._sock.rQshift32(); + } + } + + // Update our server capabilities for Actions + for (let i = 24; i <= 31; i++) { + let index = 1 << i; + this._clipboardServerCapabilitiesActions[index] = !!(actions & index); + } + + /* Caps handling done, send caps with the clients + capabilities set as a response */ + let clientActions = [ + extendedClipboardActionCaps, + extendedClipboardActionRequest, + extendedClipboardActionPeek, + extendedClipboardActionNotify, + extendedClipboardActionProvide + ]; + RFB.messages.extendedClipboardCaps(this._sock, clientActions, {extendedClipboardFormatText: 0}); + + } else if (actions === extendedClipboardActionRequest) { + if (this._viewOnly) { + return true; + } + + // Check if server has told us it can handle Provide and there is clipboard data to send. + if (this._clipboardText != null && + this._clipboardServerCapabilitiesActions[extendedClipboardActionProvide]) { + + if (formats & extendedClipboardFormatText) { + RFB.messages.extendedClipboardProvide(this._sock, [extendedClipboardFormatText], [this._clipboardText]); + } + } + + } else if (actions === extendedClipboardActionPeek) { + if (this._viewOnly) { + return true; + } + + if (this._clipboardServerCapabilitiesActions[extendedClipboardActionNotify]) { + + if (this._clipboardText != null) { + RFB.messages.extendedClipboardNotify(this._sock, [extendedClipboardFormatText]); + } else { + RFB.messages.extendedClipboardNotify(this._sock, []); + } + } + + } else if (actions === extendedClipboardActionNotify) { + if (this._viewOnly) { + return true; + } + + if (this._clipboardServerCapabilitiesActions[extendedClipboardActionRequest]) { + + if (formats & extendedClipboardFormatText) { + RFB.messages.extendedClipboardRequest(this._sock, [extendedClipboardFormatText]); + } + } + + } else if (actions === extendedClipboardActionProvide) { + if (this._viewOnly) { + return true; + } + + if (!(formats & extendedClipboardFormatText)) { + return true; + } + // Ignore what we had in our clipboard client side. + this._clipboardText = null; + + // FIXME: Should probably verify that this data was actually requested + let zlibStream = this._sock.rQshiftBytes(length - 4); + let streamInflator = new Inflator(); + let textData = null; + + streamInflator.setInput(zlibStream); + for (let i = 0; i <= 15; i++) { + let format = 1 << i; + + if (formats & format) { + + let size = 0x00; + let sizeArray = streamInflator.inflate(4); + + size |= (sizeArray[0] << 24); + size |= (sizeArray[1] << 16); + size |= (sizeArray[2] << 8); + size |= (sizeArray[3]); + let chunk = streamInflator.inflate(size); + + if (format === extendedClipboardFormatText) { + textData = chunk; + } + } + } + streamInflator.setInput(null); + + if (textData !== null) { + let tmpText = ""; + for (let i = 0; i < textData.length; i++) { + tmpText += String.fromCharCode(textData[i]); + } + textData = tmpText; + + textData = decodeUTF8(textData); + if ((textData.length > 0) && "\0" === textData.charAt(textData.length - 1)) { + textData = textData.slice(0, -1); + } + + textData = textData.replace("\r\n", "\n"); + + this.dispatchEvent(new CustomEvent( + "clipboard", + { detail: { text: textData } })); + } + } else { + return this._fail("Unexpected action in extended clipboard message: " + actions); + } + } return true; } - _handle_server_fence_msg() { + _handleServerFenceMsg() { if (this._sock.rQwait("ServerFence header", 8, 1)) { return false; } this._sock.rQskipBytes(3); // Padding let flags = this._sock.rQshift32(); @@ -1363,49 +2067,49 @@ export default class RFB extends EventTargetMixin { return true; } - _handle_xvp_msg() { + _handleXvpMsg() { if (this._sock.rQwait("XVP version and message", 3, 1)) { return false; } this._sock.rQskipBytes(1); // Padding - const xvp_ver = this._sock.rQshift8(); - const xvp_msg = this._sock.rQshift8(); + const xvpVer = this._sock.rQshift8(); + const xvpMsg = this._sock.rQshift8(); - switch (xvp_msg) { + switch (xvpMsg) { case 0: // XVP_FAIL Log.Error("XVP Operation Failed"); break; case 1: // XVP_INIT - this._rfb_xvp_ver = xvp_ver; - Log.Info("XVP extensions enabled (version " + this._rfb_xvp_ver + ")"); + this._rfbXvpVer = xvpVer; + Log.Info("XVP extensions enabled (version " + this._rfbXvpVer + ")"); this._setCapability("power", true); break; default: - this._fail("Illegal server XVP message (msg: " + xvp_msg + ")"); + this._fail("Illegal server XVP message (msg: " + xvpMsg + ")"); break; } return true; } - _normal_msg() { - let msg_type; + _normalMsg() { + let msgType; if (this._FBU.rects > 0) { - msg_type = 0; + msgType = 0; } else { - msg_type = this._sock.rQshift8(); + msgType = this._sock.rQshift8(); } let first, ret; - switch (msg_type) { + switch (msgType) { case 0: // FramebufferUpdate ret = this._framebufferUpdate(); if (ret && !this._enabledContinuousUpdates) { RFB.messages.fbUpdateRequest(this._sock, true, 0, 0, - this._fb_width, this._fb_height); + this._fbWidth, this._fbHeight); } return ret; case 1: // SetColorMapEntries - return this._handle_set_colour_map_msg(); + return this._handleSetColourMapMsg(); case 2: // Bell Log.Debug("Bell"); @@ -1415,7 +2119,7 @@ export default class RFB extends EventTargetMixin { return true; case 3: // ServerCutText - return this._handle_server_cut_text(); + return this._handleServerCutText(); case 150: // EndOfContinuousUpdates first = !this._supportsContinuousUpdates; @@ -1432,13 +2136,13 @@ export default class RFB extends EventTargetMixin { return true; case 248: // ServerFence - return this._handle_server_fence_msg(); + return this._handleServerFenceMsg(); case 250: // XVP - return this._handle_xvp_msg(); + return this._handleXvpMsg(); default: - this._fail("Unexpected server message (type " + msg_type + ")"); + this._fail("Unexpected server message (type " + msgType + ")"); Log.Debug("sock.rQslice(0, 30): " + this._sock.rQslice(0, 30)); return true; } @@ -1448,7 +2152,7 @@ export default class RFB extends EventTargetMixin { this._flushing = false; // Resume processing if (this._sock.rQlen > 0) { - this._handle_message(); + this._handleMessage(); } } @@ -1500,6 +2204,9 @@ export default class RFB extends EventTargetMixin { this._FBU.rects = 1; // Will be decreased when we return return true; + case encodings.pseudoEncodingVMwareCursor: + return this._handleVMwareCursor(); + case encodings.pseudoEncodingCursor: return this._handleCursor(); @@ -1515,6 +2222,9 @@ export default class RFB extends EventTargetMixin { } return true; + case encodings.pseudoEncodingDesktopName: + return this._handleDesktopName(); + case encodings.pseudoEncodingDesktopSize: this._resize(this._FBU.width, this._FBU.height); return true; @@ -1527,6 +2237,122 @@ export default class RFB extends EventTargetMixin { } } + _handleVMwareCursor() { + const hotx = this._FBU.x; // hotspot-x + const hoty = this._FBU.y; // hotspot-y + const w = this._FBU.width; + const h = this._FBU.height; + if (this._sock.rQwait("VMware cursor encoding", 1)) { + return false; + } + + const cursorType = this._sock.rQshift8(); + + this._sock.rQshift8(); //Padding + + let rgba; + const bytesPerPixel = 4; + + //Classic cursor + if (cursorType == 0) { + //Used to filter away unimportant bits. + //OR is used for correct conversion in js. + const PIXEL_MASK = 0xffffff00 | 0; + rgba = new Array(w * h * bytesPerPixel); + + if (this._sock.rQwait("VMware cursor classic encoding", + (w * h * bytesPerPixel) * 2, 2)) { + return false; + } + + let andMask = new Array(w * h); + for (let pixel = 0; pixel < (w * h); pixel++) { + andMask[pixel] = this._sock.rQshift32(); + } + + let xorMask = new Array(w * h); + for (let pixel = 0; pixel < (w * h); pixel++) { + xorMask[pixel] = this._sock.rQshift32(); + } + + for (let pixel = 0; pixel < (w * h); pixel++) { + if (andMask[pixel] == 0) { + //Fully opaque pixel + let bgr = xorMask[pixel]; + let r = bgr >> 8 & 0xff; + let g = bgr >> 16 & 0xff; + let b = bgr >> 24 & 0xff; + + rgba[(pixel * bytesPerPixel) ] = r; //r + rgba[(pixel * bytesPerPixel) + 1 ] = g; //g + rgba[(pixel * bytesPerPixel) + 2 ] = b; //b + rgba[(pixel * bytesPerPixel) + 3 ] = 0xff; //a + + } else if ((andMask[pixel] & PIXEL_MASK) == + PIXEL_MASK) { + //Only screen value matters, no mouse colouring + if (xorMask[pixel] == 0) { + //Transparent pixel + rgba[(pixel * bytesPerPixel) ] = 0x00; + rgba[(pixel * bytesPerPixel) + 1 ] = 0x00; + rgba[(pixel * bytesPerPixel) + 2 ] = 0x00; + rgba[(pixel * bytesPerPixel) + 3 ] = 0x00; + + } else if ((xorMask[pixel] & PIXEL_MASK) == + PIXEL_MASK) { + //Inverted pixel, not supported in browsers. + //Fully opaque instead. + rgba[(pixel * bytesPerPixel) ] = 0x00; + rgba[(pixel * bytesPerPixel) + 1 ] = 0x00; + rgba[(pixel * bytesPerPixel) + 2 ] = 0x00; + rgba[(pixel * bytesPerPixel) + 3 ] = 0xff; + + } else { + //Unhandled xorMask + rgba[(pixel * bytesPerPixel) ] = 0x00; + rgba[(pixel * bytesPerPixel) + 1 ] = 0x00; + rgba[(pixel * bytesPerPixel) + 2 ] = 0x00; + rgba[(pixel * bytesPerPixel) + 3 ] = 0xff; + } + + } else { + //Unhandled andMask + rgba[(pixel * bytesPerPixel) ] = 0x00; + rgba[(pixel * bytesPerPixel) + 1 ] = 0x00; + rgba[(pixel * bytesPerPixel) + 2 ] = 0x00; + rgba[(pixel * bytesPerPixel) + 3 ] = 0xff; + } + } + + //Alpha cursor. + } else if (cursorType == 1) { + if (this._sock.rQwait("VMware cursor alpha encoding", + (w * h * 4), 2)) { + return false; + } + + rgba = new Array(w * h * bytesPerPixel); + + for (let pixel = 0; pixel < (w * h); pixel++) { + let data = this._sock.rQshift32(); + + rgba[(pixel * 4) ] = data >> 24 & 0xff; //r + rgba[(pixel * 4) + 1 ] = data >> 16 & 0xff; //g + rgba[(pixel * 4) + 2 ] = data >> 8 & 0xff; //b + rgba[(pixel * 4) + 3 ] = data & 0xff; //a + } + + } else { + Log.Warn("The given cursor type is not supported: " + + cursorType + " given."); + return false; + } + + this._updateCursor(rgba, hotx, hoty, w, h); + + return true; + } + _handleCursor() { const hotx = this._FBU.x; // hotspot-x const hoty = this._FBU.y; // hotspot-y @@ -1546,16 +2372,16 @@ export default class RFB extends EventTargetMixin { const mask = this._sock.rQshiftBytes(masklength); let rgba = new Uint8Array(w * h * 4); - let pix_idx = 0; + let pixIdx = 0; for (let y = 0; y < h; y++) { for (let x = 0; x < w; x++) { - let mask_idx = y * Math.ceil(w / 8) + Math.floor(x / 8); - let alpha = (mask[mask_idx] << (x % 8)) & 0x80 ? 255 : 0; - rgba[pix_idx ] = pixels[pix_idx + 2]; - rgba[pix_idx + 1] = pixels[pix_idx + 1]; - rgba[pix_idx + 2] = pixels[pix_idx]; - rgba[pix_idx + 3] = alpha; - pix_idx += 4; + let maskIdx = y * Math.ceil(w / 8) + Math.floor(x / 8); + let alpha = (mask[maskIdx] << (x % 8)) & 0x80 ? 255 : 0; + rgba[pixIdx ] = pixels[pixIdx + 2]; + rgba[pixIdx + 1] = pixels[pixIdx + 1]; + rgba[pixIdx + 2] = pixels[pixIdx]; + rgba[pixIdx + 3] = alpha; + pixIdx += 4; } } @@ -1564,14 +2390,33 @@ export default class RFB extends EventTargetMixin { return true; } + _handleDesktopName() { + if (this._sock.rQwait("DesktopName", 4)) { + return false; + } + + let length = this._sock.rQshift32(); + + if (this._sock.rQwait("DesktopName", length, 4)) { + return false; + } + + let name = this._sock.rQshiftStr(length); + name = decodeUTF8(name, true); + + this._setDesktopName(name); + + return true; + } + _handleExtendedDesktopSize() { if (this._sock.rQwait("ExtendedDesktopSize", 4)) { return false; } - const number_of_screens = this._sock.rQpeek8(); + const numberOfScreens = this._sock.rQpeek8(); - let bytes = 4 + (number_of_screens * 16); + let bytes = 4 + (numberOfScreens * 16); if (this._sock.rQwait("ExtendedDesktopSize", bytes)) { return false; } @@ -1590,15 +2435,15 @@ export default class RFB extends EventTargetMixin { this._sock.rQskipBytes(1); // number-of-screens this._sock.rQskipBytes(3); // padding - for (let i = 0; i < number_of_screens; i += 1) { + for (let i = 0; i < numberOfScreens; i += 1) { // Save the id and flags of the first screen if (i === 0) { - this._screen_id = this._sock.rQshiftBytes(4); // id + this._screenID = this._sock.rQshiftBytes(4); // id this._sock.rQskipBytes(2); // x-position this._sock.rQskipBytes(2); // y-position this._sock.rQskipBytes(2); // width this._sock.rQskipBytes(2); // height - this._screen_flags = this._sock.rQshiftBytes(4); // flags + this._screenFlags = this._sock.rQshiftBytes(4); // flags } else { this._sock.rQskipBytes(16); } @@ -1651,7 +2496,7 @@ export default class RFB extends EventTargetMixin { return decoder.decodeRect(this._FBU.x, this._FBU.y, this._FBU.width, this._FBU.height, this._sock, this._display, - this._fb_depth); + this._fbDepth); } catch (err) { this._fail("Error decoding rect: " + err); return false; @@ -1662,14 +2507,14 @@ export default class RFB extends EventTargetMixin { if (!this._enabledContinuousUpdates) { return; } RFB.messages.enableContinuousUpdates(this._sock, true, 0, 0, - this._fb_width, this._fb_height); + this._fbWidth, this._fbHeight); } _resize(width, height) { - this._fb_width = width; - this._fb_height = height; + this._fbWidth = width; + this._fbHeight = height; - this._display.resize(this._fb_width, this._fb_height); + this._display.resize(this._fbWidth, this._fbHeight); // Adjust the visible viewport based on the new dimensions this._updateClip(); @@ -1679,7 +2524,7 @@ export default class RFB extends EventTargetMixin { } _xvpOp(ver, op) { - if (this._rfb_xvp_ver < ver) { return; } + if (this._rfbXvpVer < ver) { return; } Log.Info("Sending XVP operation " + op + " (version " + ver + ")"); RFB.messages.xvpOp(this._sock, ver, op); } @@ -1715,6 +2560,10 @@ export default class RFB extends EventTargetMixin { } _refreshCursor() { + if (this._rfbConnectionState !== "connecting" && + this._rfbConnectionState !== "connected") { + return; + } const image = this._shouldShowDotCursor() ? RFB.cursors.dot : this._cursorImage; this._cursor.change(image.rgbaPixels, image.hotx, image.hoty, @@ -1750,13 +2599,13 @@ RFB.messages = { }, QEMUExtendedKeyEvent(sock, keysym, down, keycode) { - function getRFBkeycode(xt_scancode) { + function getRFBkeycode(xtScanCode) { const upperByte = (keycode >> 8); const lowerByte = (keycode & 0x00ff); if (upperByte === 0xe0 && lowerByte < 0x7f) { return lowerByte | 0x80; } - return xt_scancode; + return xtScanCode; } const buff = sock._sQ; @@ -1802,8 +2651,102 @@ RFB.messages = { sock.flush(); }, - // TODO(directxman12): make this unicode compatible? - clientCutText(sock, text) { + // Used to build Notify and Request data. + _buildExtendedClipboardFlags(actions, formats) { + let data = new Uint8Array(4); + let formatFlag = 0x00000000; + let actionFlag = 0x00000000; + + for (let i = 0; i < actions.length; i++) { + actionFlag |= actions[i]; + } + + for (let i = 0; i < formats.length; i++) { + formatFlag |= formats[i]; + } + + data[0] = actionFlag >> 24; // Actions + data[1] = 0x00; // Reserved + data[2] = 0x00; // Reserved + data[3] = formatFlag; // Formats + + return data; + }, + + extendedClipboardProvide(sock, formats, inData) { + // Deflate incomming data and their sizes + let deflator = new Deflator(); + let dataToDeflate = []; + + for (let i = 0; i < formats.length; i++) { + // We only support the format Text at this time + if (formats[i] != extendedClipboardFormatText) { + throw new Error("Unsupported extended clipboard format for Provide message."); + } + + // Change lone \r or \n into \r\n as defined in rfbproto + inData[i] = inData[i].replace(/\r\n|\r|\n/gm, "\r\n"); + + // Check if it already has \0 + let text = encodeUTF8(inData[i] + "\0"); + + dataToDeflate.push( (text.length >> 24) & 0xFF, + (text.length >> 16) & 0xFF, + (text.length >> 8) & 0xFF, + (text.length & 0xFF)); + + for (let j = 0; j < text.length; j++) { + dataToDeflate.push(text.charCodeAt(j)); + } + } + + let deflatedData = deflator.deflate(new Uint8Array(dataToDeflate)); + + // Build data to send + let data = new Uint8Array(4 + deflatedData.length); + data.set(RFB.messages._buildExtendedClipboardFlags([extendedClipboardActionProvide], + formats)); + data.set(deflatedData, 4); + + RFB.messages.clientCutText(sock, data, true); + }, + + extendedClipboardNotify(sock, formats) { + let flags = RFB.messages._buildExtendedClipboardFlags([extendedClipboardActionNotify], + formats); + RFB.messages.clientCutText(sock, flags, true); + }, + + extendedClipboardRequest(sock, formats) { + let flags = RFB.messages._buildExtendedClipboardFlags([extendedClipboardActionRequest], + formats); + RFB.messages.clientCutText(sock, flags, true); + }, + + extendedClipboardCaps(sock, actions, formats) { + let formatKeys = Object.keys(formats); + let data = new Uint8Array(4 + (4 * formatKeys.length)); + + formatKeys.map(x => parseInt(x)); + formatKeys.sort((a, b) => a - b); + + data.set(RFB.messages._buildExtendedClipboardFlags(actions, [])); + + let loopOffset = 4; + for (let i = 0; i < formatKeys.length; i++) { + data[loopOffset] = formats[formatKeys[i]] >> 24; + data[loopOffset + 1] = formats[formatKeys[i]] >> 16; + data[loopOffset + 2] = formats[formatKeys[i]] >> 8; + data[loopOffset + 3] = formats[formatKeys[i]] >> 0; + + loopOffset += 4; + data[3] |= (1 << formatKeys[i]); // Update our format flags + } + + RFB.messages.clientCutText(sock, data, true); + }, + + clientCutText(sock, data, extended = false) { const buff = sock._sQ; const offset = sock._sQlen; @@ -1813,7 +2756,12 @@ RFB.messages = { buff[offset + 2] = 0; // padding buff[offset + 3] = 0; // padding - let length = text.length; + let length; + if (extended) { + length = toUnsigned32bit(-data.length); + } else { + length = data.length; + } buff[offset + 4] = length >> 24; buff[offset + 5] = length >> 16; @@ -1822,24 +2770,25 @@ RFB.messages = { sock._sQlen += 8; - // We have to keep track of from where in the text we begin creating the + // We have to keep track of from where in the data we begin creating the // buffer for the flush in the next iteration. - let textOffset = 0; + let dataOffset = 0; - let remaining = length; + let remaining = data.length; while (remaining > 0) { let flushSize = Math.min(remaining, (sock._sQbufferSize - sock._sQlen)); for (let i = 0; i < flushSize; i++) { - buff[sock._sQlen + i] = text.charCodeAt(textOffset + i); + buff[sock._sQlen + i] = data[dataOffset + i]; } sock._sQlen += flushSize; sock.flush(); remaining -= flushSize; - textOffset += flushSize; + dataOffset += flushSize; } + }, setDesktopSize(sock, width, height, id, flags) { @@ -1925,7 +2874,7 @@ RFB.messages = { sock.flush(); }, - pixelFormat(sock, depth, true_color) { + pixelFormat(sock, depth, trueColor) { const buff = sock._sQ; const offset = sock._sQlen; @@ -1950,7 +2899,7 @@ RFB.messages = { buff[offset + 4] = bpp; // bits-per-pixel buff[offset + 5] = depth; // depth buff[offset + 6] = 0; // little-endian - buff[offset + 7] = true_color ? 1 : 0; // true-color + buff[offset + 7] = trueColor ? 1 : 0; // true-color buff[offset + 8] = 0; // red-max buff[offset + 9] = (1 << bits) - 1; // red-max @@ -1961,9 +2910,9 @@ RFB.messages = { buff[offset + 12] = 0; // blue-max buff[offset + 13] = (1 << bits) - 1; // blue-max - buff[offset + 14] = bits * 2; // red-shift + buff[offset + 14] = bits * 0; // red-shift buff[offset + 15] = bits * 1; // green-shift - buff[offset + 16] = bits * 0; // blue-shift + buff[offset + 16] = bits * 2; // blue-shift buff[offset + 17] = 0; // padding buff[offset + 18] = 0; // padding diff --git a/systemvm/agent/noVNC/core/util/browser.js b/systemvm/agent/noVNC/core/util/browser.js index 8996cfeda712..155480142299 100644 --- a/systemvm/agent/noVNC/core/util/browser.js +++ b/systemvm/agent/noVNC/core/util/browser.js @@ -1,9 +1,11 @@ /* * noVNC: HTML5 VNC client - * Copyright (C) 2018 The noVNC Authors + * Copyright (C) 2019 The noVNC Authors * Licensed under MPL 2.0 (see LICENSE.txt) * * See README.md for usage and integration instructions. + * + * Browser feature support detection */ import * as Log from './logging.js'; @@ -31,7 +33,7 @@ try { const target = document.createElement('canvas'); target.style.cursor = 'url("data:image/x-icon;base64,AAACAAEACAgAAAIAAgA4AQAAFgAAACgAAAAIAAAAEAAAAAEAIAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////AAAAAAAAAAAAAAAAAAAAAA==") 2 2, default'; - if (target.style.cursor) { + if (target.style.cursor.indexOf("url") === 0) { Log.Info("Data URI scheme cursor supported"); _supportsCursorURIs = true; } else { @@ -52,6 +54,38 @@ try { } export const supportsImageMetadata = _supportsImageMetadata; +let _hasScrollbarGutter = true; +try { + // Create invisible container + const container = document.createElement('div'); + container.style.visibility = 'hidden'; + container.style.overflow = 'scroll'; // forcing scrollbars + document.body.appendChild(container); + + // Create a div and place it in the container + const child = document.createElement('div'); + container.appendChild(child); + + // Calculate the difference between the container's full width + // and the child's width - the difference is the scrollbars + const scrollbarWidth = (container.offsetWidth - child.offsetWidth); + + // Clean up + container.parentNode.removeChild(container); + + _hasScrollbarGutter = scrollbarWidth != 0; +} catch (exc) { + Log.Error("Scrollbar test exception: " + exc); +} +export const hasScrollbarGutter = _hasScrollbarGutter; + +/* + * The functions for detection of platforms and browsers below are exported + * but the use of these should be minimized as much as possible. + * + * It's better to use feature detection than platform detection. + */ + export function isMac() { return navigator && !!(/mac/i).exec(navigator.platform); } @@ -67,10 +101,6 @@ export function isIOS() { !!(/ipod/i).exec(navigator.platform)); } -export function isAndroid() { - return navigator && !!(/android/i).exec(navigator.userAgent); -} - export function isSafari() { return navigator && (navigator.userAgent.indexOf('Safari') !== -1 && navigator.userAgent.indexOf('Chrome') === -1); diff --git a/systemvm/agent/noVNC/core/util/cursor.js b/systemvm/agent/noVNC/core/util/cursor.js index 0d0b754a863f..4db1dab23fb6 100644 --- a/systemvm/agent/noVNC/core/util/cursor.js +++ b/systemvm/agent/noVNC/core/util/cursor.js @@ -1,6 +1,6 @@ /* * noVNC: HTML5 VNC client - * Copyright (C) 2018 The noVNC Authors + * Copyright (C) 2019 The noVNC Authors * Licensed under MPL 2.0 or any later version (see LICENSE.txt) */ @@ -20,7 +20,6 @@ export default class Cursor { this._canvas.style.pointerEvents = 'none'; // Can't use "display" because of Firefox bug #1445997 this._canvas.style.visibility = 'hidden'; - document.body.appendChild(this._canvas); } this._position = { x: 0, y: 0 }; @@ -31,9 +30,6 @@ export default class Cursor { 'mouseleave': this._handleMouseLeave.bind(this), 'mousemove': this._handleMouseMove.bind(this), 'mouseup': this._handleMouseUp.bind(this), - 'touchstart': this._handleTouchStart.bind(this), - 'touchmove': this._handleTouchMove.bind(this), - 'touchend': this._handleTouchEnd.bind(this), }; } @@ -45,6 +41,8 @@ export default class Cursor { this._target = target; if (useFallback) { + document.body.appendChild(this._canvas); + // FIXME: These don't fire properly except for mouse /// movement in IE. We want to also capture element // movement, size changes, visibility, etc. @@ -53,17 +51,16 @@ export default class Cursor { this._target.addEventListener('mouseleave', this._eventHandlers.mouseleave, options); this._target.addEventListener('mousemove', this._eventHandlers.mousemove, options); this._target.addEventListener('mouseup', this._eventHandlers.mouseup, options); - - // There is no "touchleave" so we monitor touchstart globally - window.addEventListener('touchstart', this._eventHandlers.touchstart, options); - this._target.addEventListener('touchmove', this._eventHandlers.touchmove, options); - this._target.addEventListener('touchend', this._eventHandlers.touchend, options); } this.clear(); } detach() { + if (!this._target) { + return; + } + if (useFallback) { const options = { capture: true, passive: true }; this._target.removeEventListener('mouseover', this._eventHandlers.mouseover, options); @@ -71,9 +68,7 @@ export default class Cursor { this._target.removeEventListener('mousemove', this._eventHandlers.mousemove, options); this._target.removeEventListener('mouseup', this._eventHandlers.mouseup, options); - window.removeEventListener('touchstart', this._eventHandlers.touchstart, options); - this._target.removeEventListener('touchmove', this._eventHandlers.touchmove, options); - this._target.removeEventListener('touchend', this._eventHandlers.touchend, options); + document.body.removeChild(this._canvas); } this._target = null; @@ -124,6 +119,27 @@ export default class Cursor { this._hotSpot.y = 0; } + // Mouse events might be emulated, this allows + // moving the cursor in such cases + move(clientX, clientY) { + if (!useFallback) { + return; + } + // clientX/clientY are relative the _visual viewport_, + // but our position is relative the _layout viewport_, + // so try to compensate when we can + if (window.visualViewport) { + this._position.x = clientX + window.visualViewport.offsetLeft; + this._position.y = clientY + window.visualViewport.offsetTop; + } else { + this._position.x = clientX; + this._position.y = clientY; + } + this._updatePosition(); + let target = document.elementFromPoint(clientX, clientY); + this._updateVisibility(target); + } + _handleMouseOver(event) { // This event could be because we're entering the target, or // moving around amongst its sub elements. Let the move handler @@ -132,7 +148,8 @@ export default class Cursor { } _handleMouseLeave(event) { - this._hideCursor(); + // Check if we should show the cursor on the element we are leaving to + this._updateVisibility(event.relatedTarget); } _handleMouseMove(event) { @@ -150,27 +167,29 @@ export default class Cursor { // now and adjust visibility based on that. let target = document.elementFromPoint(event.clientX, event.clientY); this._updateVisibility(target); - } - _handleTouchStart(event) { - // Just as for mouseover, we let the move handler deal with it - this._handleTouchMove(event); - } - - _handleTouchMove(event) { - this._updateVisibility(event.target); - - this._position.x = event.changedTouches[0].clientX - this._hotSpot.x; - this._position.y = event.changedTouches[0].clientY - this._hotSpot.y; - - this._updatePosition(); - } - - _handleTouchEnd(event) { - // Same principle as for mouseup - let target = document.elementFromPoint(event.changedTouches[0].clientX, - event.changedTouches[0].clientY); - this._updateVisibility(target); + // Captures end with a mouseup but we can't know the event order of + // mouseup vs releaseCapture. + // + // In the cases when releaseCapture comes first, the code above is + // enough. + // + // In the cases when the mouseup comes first, we need wait for the + // browser to flush all events and then check again if the cursor + // should be visible. + if (this._captureIsActive()) { + window.setTimeout(() => { + // We might have detached at this point + if (!this._target) { + return; + } + // Refresh the target from elementFromPoint since queued events + // might have altered the DOM + target = document.elementFromPoint(event.clientX, + event.clientY); + this._updateVisibility(target); + }, 0); + } } _showCursor() { @@ -189,6 +208,9 @@ export default class Cursor { // (i.e. are we over the target, or a child of the target without a // different cursor set) _shouldShowCursor(target) { + if (!target) { + return false; + } // Easy case if (target === this._target) { return true; @@ -207,6 +229,11 @@ export default class Cursor { } _updateVisibility(target) { + // When the cursor target has capture we want to show the cursor. + // So, if a capture is active - look at the captured element instead. + if (this._captureIsActive()) { + target = document.captureElement; + } if (this._shouldShowCursor(target)) { this._showCursor(); } else { @@ -218,4 +245,9 @@ export default class Cursor { this._canvas.style.left = this._position.x + "px"; this._canvas.style.top = this._position.y + "px"; } + + _captureIsActive() { + return document.captureElement && + document.documentElement.contains(document.captureElement); + } } diff --git a/systemvm/agent/noVNC/core/util/element.js b/systemvm/agent/noVNC/core/util/element.js new file mode 100644 index 000000000000..466a7453e1dc --- /dev/null +++ b/systemvm/agent/noVNC/core/util/element.js @@ -0,0 +1,32 @@ +/* + * noVNC: HTML5 VNC client + * Copyright (C) 2020 The noVNC Authors + * Licensed under MPL 2.0 (see LICENSE.txt) + * + * See README.md for usage and integration instructions. + */ + +/* + * HTML element utility functions + */ + +export function clientToElement(x, y, elem) { + const bounds = elem.getBoundingClientRect(); + let pos = { x: 0, y: 0 }; + // Clip to target bounds + if (x < bounds.left) { + pos.x = 0; + } else if (x >= bounds.right) { + pos.x = bounds.width - 1; + } else { + pos.x = x - bounds.left; + } + if (y < bounds.top) { + pos.y = 0; + } else if (y >= bounds.bottom) { + pos.y = bounds.height - 1; + } else { + pos.y = y - bounds.top; + } + return pos; +} diff --git a/systemvm/agent/noVNC/core/util/events.js b/systemvm/agent/noVNC/core/util/events.js index f1222796a7e9..39eefd4596c9 100644 --- a/systemvm/agent/noVNC/core/util/events.js +++ b/systemvm/agent/noVNC/core/util/events.js @@ -21,7 +21,8 @@ export function stopEvent(e) { // Emulate Element.setCapture() when not supported let _captureRecursion = false; -let _captureElem = null; +let _elementForUnflushedEvents = null; +document.captureElement = null; function _captureProxy(e) { // Recursion protection as we'll see our own event if (_captureRecursion) return; @@ -30,7 +31,11 @@ function _captureProxy(e) { const newEv = new e.constructor(e.type, e); _captureRecursion = true; - _captureElem.dispatchEvent(newEv); + if (document.captureElement) { + document.captureElement.dispatchEvent(newEv); + } else { + _elementForUnflushedEvents.dispatchEvent(newEv); + } _captureRecursion = false; // Avoid double events @@ -48,58 +53,56 @@ function _captureProxy(e) { } // Follow cursor style of target element -function _captureElemChanged() { - const captureElem = document.getElementById("noVNC_mouse_capture_elem"); - captureElem.style.cursor = window.getComputedStyle(_captureElem).cursor; +function _capturedElemChanged() { + const proxyElem = document.getElementById("noVNC_mouse_capture_elem"); + proxyElem.style.cursor = window.getComputedStyle(document.captureElement).cursor; } -const _captureObserver = new MutationObserver(_captureElemChanged); - -let _captureIndex = 0; +const _captureObserver = new MutationObserver(_capturedElemChanged); -export function setCapture(elem) { - if (elem.setCapture) { +export function setCapture(target) { + if (target.setCapture) { - elem.setCapture(); + target.setCapture(); + document.captureElement = target; // IE releases capture on 'click' events which might not trigger - elem.addEventListener('mouseup', releaseCapture); + target.addEventListener('mouseup', releaseCapture); } else { // Release any existing capture in case this method is // called multiple times without coordination releaseCapture(); - let captureElem = document.getElementById("noVNC_mouse_capture_elem"); + let proxyElem = document.getElementById("noVNC_mouse_capture_elem"); - if (captureElem === null) { - captureElem = document.createElement("div"); - captureElem.id = "noVNC_mouse_capture_elem"; - captureElem.style.position = "fixed"; - captureElem.style.top = "0px"; - captureElem.style.left = "0px"; - captureElem.style.width = "100%"; - captureElem.style.height = "100%"; - captureElem.style.zIndex = 10000; - captureElem.style.display = "none"; - document.body.appendChild(captureElem); + if (proxyElem === null) { + proxyElem = document.createElement("div"); + proxyElem.id = "noVNC_mouse_capture_elem"; + proxyElem.style.position = "fixed"; + proxyElem.style.top = "0px"; + proxyElem.style.left = "0px"; + proxyElem.style.width = "100%"; + proxyElem.style.height = "100%"; + proxyElem.style.zIndex = 10000; + proxyElem.style.display = "none"; + document.body.appendChild(proxyElem); // This is to make sure callers don't get confused by having // our blocking element as the target - captureElem.addEventListener('contextmenu', _captureProxy); + proxyElem.addEventListener('contextmenu', _captureProxy); - captureElem.addEventListener('mousemove', _captureProxy); - captureElem.addEventListener('mouseup', _captureProxy); + proxyElem.addEventListener('mousemove', _captureProxy); + proxyElem.addEventListener('mouseup', _captureProxy); } - _captureElem = elem; - _captureIndex++; + document.captureElement = target; // Track cursor and get initial cursor - _captureObserver.observe(elem, {attributes: true}); - _captureElemChanged(); + _captureObserver.observe(target, {attributes: true}); + _capturedElemChanged(); - captureElem.style.display = ""; + proxyElem.style.display = ""; // We listen to events on window in order to keep tracking if it // happens to leave the viewport @@ -112,26 +115,26 @@ export function releaseCapture() { if (document.releaseCapture) { document.releaseCapture(); + document.captureElement = null; } else { - if (!_captureElem) { + if (!document.captureElement) { return; } - // There might be events already queued, so we need to wait for - // them to flush. E.g. contextmenu in Microsoft Edge - window.setTimeout((expected) => { - // Only clear it if it's the expected grab (i.e. no one - // else has initiated a new grab) - if (_captureIndex === expected) { - _captureElem = null; - } - }, 0, _captureIndex); + // There might be events already queued. The event proxy needs + // access to the captured element for these queued events. + // E.g. contextmenu (right-click) in Microsoft Edge + // + // Before removing the capturedElem pointer we save it to a + // temporary variable that the unflushed events can use. + _elementForUnflushedEvents = document.captureElement; + document.captureElement = null; _captureObserver.disconnect(); - const captureElem = document.getElementById("noVNC_mouse_capture_elem"); - captureElem.style.display = "none"; + const proxyElem = document.getElementById("noVNC_mouse_capture_elem"); + proxyElem.style.display = "none"; window.removeEventListener('mousemove', _captureProxy); window.removeEventListener('mouseup', _captureProxy); diff --git a/systemvm/agent/noVNC/core/util/eventtarget.js b/systemvm/agent/noVNC/core/util/eventtarget.js index f54ca9bf1122..a21aa5494d87 100644 --- a/systemvm/agent/noVNC/core/util/eventtarget.js +++ b/systemvm/agent/noVNC/core/util/eventtarget.js @@ -1,6 +1,6 @@ /* * noVNC: HTML5 VNC client - * Copyright (C) 2018 The noVNC Authors + * Copyright (C) 2019 The noVNC Authors * Licensed under MPL 2.0 (see LICENSE.txt) * * See README.md for usage and integration instructions. diff --git a/systemvm/agent/noVNC/core/util/int.js b/systemvm/agent/noVNC/core/util/int.js new file mode 100644 index 000000000000..001f40f2ab50 --- /dev/null +++ b/systemvm/agent/noVNC/core/util/int.js @@ -0,0 +1,15 @@ +/* + * noVNC: HTML5 VNC client + * Copyright (C) 2020 The noVNC Authors + * Licensed under MPL 2.0 (see LICENSE.txt) + * + * See README.md for usage and integration instructions. + */ + +export function toUnsigned32bit(toConvert) { + return toConvert >>> 0; +} + +export function toSigned32bit(toConvert) { + return toConvert | 0; +} diff --git a/systemvm/agent/noVNC/core/util/logging.js b/systemvm/agent/noVNC/core/util/logging.js index 4c8943d00546..fe449e935154 100644 --- a/systemvm/agent/noVNC/core/util/logging.js +++ b/systemvm/agent/noVNC/core/util/logging.js @@ -1,6 +1,6 @@ /* * noVNC: HTML5 VNC client - * Copyright (C) 2018 The noVNC Authors + * Copyright (C) 2019 The noVNC Authors * Licensed under MPL 2.0 (see LICENSE.txt) * * See README.md for usage and integration instructions. @@ -10,18 +10,18 @@ * Logging/debug routines */ -let _log_level = 'warn'; +let _logLevel = 'warn'; let Debug = () => {}; let Info = () => {}; let Warn = () => {}; let Error = () => {}; -export function init_logging(level) { +export function initLogging(level) { if (typeof level === 'undefined') { - level = _log_level; + level = _logLevel; } else { - _log_level = level; + _logLevel = level; } Debug = Info = Warn = Error = () => {}; @@ -46,11 +46,11 @@ export function init_logging(level) { } } -export function get_logging() { - return _log_level; +export function getLogging() { + return _logLevel; } export { Debug, Info, Warn, Error }; // Initialize logging level -init_logging(); +initLogging(); diff --git a/systemvm/agent/noVNC/core/util/polyfill.js b/systemvm/agent/noVNC/core/util/polyfill.js index 648ceebc3c22..0e458c8606ba 100644 --- a/systemvm/agent/noVNC/core/util/polyfill.js +++ b/systemvm/agent/noVNC/core/util/polyfill.js @@ -1,6 +1,6 @@ /* * noVNC: HTML5 VNC client - * Copyright (C) 2018 The noVNC Authors + * Copyright (C) 2020 The noVNC Authors * Licensed under MPL 2.0 or any later version (see LICENSE.txt) */ @@ -52,3 +52,10 @@ if (typeof Object.assign != 'function') { window.CustomEvent = CustomEvent; } })(); + +/* Number.isInteger() (taken from MDN) */ +Number.isInteger = Number.isInteger || function isInteger(value) { + return typeof value === 'number' && + isFinite(value) && + Math.floor(value) === value; +}; diff --git a/systemvm/agent/noVNC/core/util/strings.js b/systemvm/agent/noVNC/core/util/strings.js index 61f4f237d937..3dd4b29fb023 100644 --- a/systemvm/agent/noVNC/core/util/strings.js +++ b/systemvm/agent/noVNC/core/util/strings.js @@ -1,14 +1,28 @@ /* * noVNC: HTML5 VNC client - * Copyright (C) 2018 The noVNC Authors + * Copyright (C) 2019 The noVNC Authors * Licensed under MPL 2.0 (see LICENSE.txt) * * See README.md for usage and integration instructions. */ -/* - * Decode from UTF-8 - */ -export function decodeUTF8(utf8string) { - return decodeURIComponent(escape(utf8string)); +// Decode from UTF-8 +export function decodeUTF8(utf8string, allowLatin1=false) { + try { + return decodeURIComponent(escape(utf8string)); + } catch (e) { + if (e instanceof URIError) { + if (allowLatin1) { + // If we allow Latin1 we can ignore any decoding fails + // and in these cases return the original string + return utf8string; + } + } + throw e; + } +} + +// Encode to UTF-8 +export function encodeUTF8(DOMString) { + return unescape(encodeURIComponent(DOMString)); } diff --git a/systemvm/agent/noVNC/core/websock.js b/systemvm/agent/noVNC/core/websock.js index 51b9a66fb682..3156aed6f5e1 100644 --- a/systemvm/agent/noVNC/core/websock.js +++ b/systemvm/agent/noVNC/core/websock.js @@ -1,6 +1,6 @@ /* * Websock: high-performance binary WebSockets - * Copyright (C) 2018 The noVNC Authors + * Copyright (C) 2019 The noVNC Authors * Licensed under MPL 2.0 (see LICENSE.txt) * * Websock is similar to the standard WebSocket object but with extra @@ -17,6 +17,8 @@ import * as Log from './util/logging.js'; // this has performance issues in some versions Chromium, and // doesn't gain a tremendous amount of performance increase in Firefox // at the moment. It may be valuable to turn it on in the future. +// Also copyWithin() for TypedArrays is not supported in IE 11 or +// Safari 13 (at the moment we want to support Safari 11). const ENABLE_COPYWITHIN = false; const MAX_RQ_GROW_SIZE = 40 * 1024 * 1024; // 40 MiB @@ -27,7 +29,6 @@ export default class Websock { this._rQi = 0; // Receive queue index this._rQlen = 0; // Next write position in the receive queue this._rQbufferSize = 1024 * 1024 * 4; // Receive queue buffer size (4 MiB) - this._rQmax = this._rQbufferSize / 8; // called in init: this._rQ = new Uint8Array(this._rQbufferSize); this._rQ = null; // Receive queue @@ -143,7 +144,7 @@ export default class Websock { flush() { if (this._sQlen > 0 && this._websocket.readyState === WebSocket.OPEN) { - this._websocket.send(this._encode_message()); + this._websocket.send(this._encodeMessage()); this._sQlen = 0; } } @@ -154,7 +155,7 @@ export default class Websock { this.flush(); } - send_string(str) { + sendString(str) { this.send(str.split('').map(chr => chr.charCodeAt(0))); } @@ -167,13 +168,13 @@ export default class Websock { this._eventHandlers[evt] = handler; } - _allocate_buffers() { + _allocateBuffers() { this._rQ = new Uint8Array(this._rQbufferSize); this._sQ = new Uint8Array(this._sQbufferSize); } init() { - this._allocate_buffers(); + this._allocateBuffers(); this._rQi = 0; this._websocket = null; } @@ -184,7 +185,7 @@ export default class Websock { this._websocket = new WebSocket(uri, protocols); this._websocket.binaryType = 'arraybuffer'; - this._websocket.onmessage = this._recv_message.bind(this); + this._websocket.onmessage = this._recvMessage.bind(this); this._websocket.onopen = () => { Log.Debug('>> WebSock.onopen'); if (this._websocket.protocol) { @@ -219,42 +220,46 @@ export default class Websock { } // private methods - _encode_message() { + _encodeMessage() { // Put in a binary arraybuffer // according to the spec, you can send ArrayBufferViews with the send method return new Uint8Array(this._sQ.buffer, 0, this._sQlen); } - _expand_compact_rQ(min_fit) { - const resizeNeeded = min_fit || this.rQlen > this._rQbufferSize / 2; + // We want to move all the unread data to the start of the queue, + // e.g. compacting. + // The function also expands the receive que if needed, and for + // performance reasons we combine these two actions to avoid + // unneccessary copying. + _expandCompactRQ(minFit) { + // if we're using less than 1/8th of the buffer even with the incoming bytes, compact in place + // instead of resizing + const requiredBufferSize = (this._rQlen - this._rQi + minFit) * 8; + const resizeNeeded = this._rQbufferSize < requiredBufferSize; + if (resizeNeeded) { - if (!min_fit) { - // just double the size if we need to do compaction - this._rQbufferSize *= 2; - } else { - // otherwise, make sure we satisy rQlen - rQi + min_fit < rQbufferSize / 8 - this._rQbufferSize = (this.rQlen + min_fit) * 8; - } + // Make sure we always *at least* double the buffer size, and have at least space for 8x + // the current amount of data + this._rQbufferSize = Math.max(this._rQbufferSize * 2, requiredBufferSize); } // we don't want to grow unboundedly if (this._rQbufferSize > MAX_RQ_GROW_SIZE) { this._rQbufferSize = MAX_RQ_GROW_SIZE; - if (this._rQbufferSize - this.rQlen < min_fit) { + if (this._rQbufferSize - this.rQlen < minFit) { throw new Error("Receive Queue buffer exceeded " + MAX_RQ_GROW_SIZE + " bytes, and the new message could not fit"); } } if (resizeNeeded) { - const old_rQbuffer = this._rQ.buffer; - this._rQmax = this._rQbufferSize / 8; + const oldRQbuffer = this._rQ.buffer; this._rQ = new Uint8Array(this._rQbufferSize); - this._rQ.set(new Uint8Array(old_rQbuffer, this._rQi)); + this._rQ.set(new Uint8Array(oldRQbuffer, this._rQi, this._rQlen - this._rQi)); } else { if (ENABLE_COPYWITHIN) { - this._rQ.copyWithin(0, this._rQi); + this._rQ.copyWithin(0, this._rQi, this._rQlen); } else { - this._rQ.set(new Uint8Array(this._rQ.buffer, this._rQi)); + this._rQ.set(new Uint8Array(this._rQ.buffer, this._rQi, this._rQlen - this._rQi)); } } @@ -262,26 +267,25 @@ export default class Websock { this._rQi = 0; } - _decode_message(data) { - // push arraybuffer values onto the end + // push arraybuffer values onto the end of the receive que + _DecodeMessage(data) { const u8 = new Uint8Array(data); if (u8.length > this._rQbufferSize - this._rQlen) { - this._expand_compact_rQ(u8.length); + this._expandCompactRQ(u8.length); } this._rQ.set(u8, this._rQlen); this._rQlen += u8.length; } - _recv_message(e) { - this._decode_message(e.data); + _recvMessage(e) { + this._DecodeMessage(e.data); if (this.rQlen > 0) { this._eventHandlers.message(); - // Compact the receive queue if (this._rQlen == this._rQi) { + // All data has now been processed, this means we + // can reset the receive queue. this._rQlen = 0; this._rQi = 0; - } else if (this._rQlen > this._rQmax) { - this._expand_compact_rQ(); } } else { Log.Debug("Ignoring empty message"); diff --git a/systemvm/agent/noVNC/docs/API-internal.md b/systemvm/agent/noVNC/docs/API-internal.md deleted file mode 100644 index 0b29afb61fc2..000000000000 --- a/systemvm/agent/noVNC/docs/API-internal.md +++ /dev/null @@ -1,122 +0,0 @@ -# 1. Internal Modules - -The noVNC client is composed of several internal modules that handle -rendering, input, networking, etc. Each of the modules is designed to -be cross-browser and independent from each other. - -Note however that the API of these modules is not guaranteed to be -stable, and this documentation is not maintained as well as the -official external API. - - -## 1.1 Module List - -* __Mouse__ (core/input/mouse.js): Mouse input event handler with -limited touch support. - -* __Keyboard__ (core/input/keyboard.js): Keyboard input event handler with -non-US keyboard support. Translates keyDown and keyUp events to X11 -keysym values. - -* __Display__ (core/display.js): Efficient 2D rendering abstraction -layered on the HTML5 canvas element. - -* __Websock__ (core/websock.js): Websock client from websockify -with transparent binary data support. -[Websock API](https://github.com/novnc/websockify/wiki/websock.js) wiki page. - - -## 1.2 Callbacks - -For the Mouse, Keyboard and Display objects the callback functions are -assigned to configuration attributes, just as for the RFB object. The -WebSock module has a method named 'on' that takes two parameters: the -callback event name, and the callback function. - -## 2. Modules - -## 2.1 Mouse Module - -### 2.1.1 Configuration Attributes - -| name | type | mode | default | description -| ----------- | ---- | ---- | -------- | ------------ -| touchButton | int | RW | 1 | Button mask (1, 2, 4) for which click to send on touch devices. 0 means ignore clicks. - -### 2.1.2 Methods - -| name | parameters | description -| ------ | ---------- | ------------ -| grab | () | Begin capturing mouse events -| ungrab | () | Stop capturing mouse events - -### 2.1.2 Callbacks - -| name | parameters | description -| ------------- | ------------------- | ------------ -| onmousebutton | (x, y, down, bmask) | Handler for mouse button click/release -| onmousemove | (x, y) | Handler for mouse movement - - -## 2.2 Keyboard Module - -### 2.2.1 Configuration Attributes - -None - -### 2.2.2 Methods - -| name | parameters | description -| ------ | ---------- | ------------ -| grab | () | Begin capturing keyboard events -| ungrab | () | Stop capturing keyboard events - -### 2.2.3 Callbacks - -| name | parameters | description -| ---------- | -------------------- | ------------ -| onkeypress | (keysym, code, down) | Handler for key press/release - - -## 2.3 Display Module - -### 2.3.1 Configuration Attributes - -| name | type | mode | default | description -| ------------ | ----- | ---- | ------- | ------------ -| logo | raw | RW | | Logo to display when cleared: {"width": width, "height": height, "type": mime-type, "data": data} -| scale | float | RW | 1.0 | Display area scale factor 0.0 - 1.0 -| clipViewport | bool | RW | false | Use viewport clipping -| width | int | RO | | Display area width -| height | int | RO | | Display area height - -### 2.3.2 Methods - -| name | parameters | description -| ------------------ | ------------------------------------------------------- | ------------ -| viewportChangePos | (deltaX, deltaY) | Move the viewport relative to the current location -| viewportChangeSize | (width, height) | Change size of the viewport -| absX | (x) | Return X relative to the remote display -| absY | (y) | Return Y relative to the remote display -| resize | (width, height) | Set width and height -| flip | (from_queue) | Update the visible canvas with the contents of the rendering canvas -| clear | () | Clear the display (show logo if set) -| pending | () | Check if there are waiting items in the render queue -| flush | () | Resume processing the render queue unless it's empty -| fillRect | (x, y, width, height, color, from_queue) | Draw a filled in rectangle -| copyImage | (old_x, old_y, new_x, new_y, width, height, from_queue) | Copy a rectangular area -| imageRect | (x, y, mime, arr) | Draw a rectangle with an image -| startTile | (x, y, width, height, color) | Begin updating a tile -| subTile | (tile, x, y, w, h, color) | Update a sub-rectangle within the given tile -| finishTile | () | Draw the current tile to the display -| blitImage | (x, y, width, height, arr, offset, from_queue) | Blit pixels (of R,G,B,A) to the display -| blitRgbImage | (x, y, width, height, arr, offset, from_queue) | Blit RGB encoded image to display -| blitRgbxImage | (x, y, width, height, arr, offset, from_queue) | Blit RGBX encoded image to display -| drawImage | (img, x, y) | Draw image and track damage -| autoscale | (containerWidth, containerHeight) | Scale the display - -### 2.3.3 Callbacks - -| name | parameters | description -| ------- | ---------- | ------------ -| onflush | () | A display flush has been requested and we are now ready to resume FBU processing diff --git a/systemvm/agent/noVNC/docs/API.md b/systemvm/agent/noVNC/docs/API.md deleted file mode 100644 index d587429c176f..000000000000 --- a/systemvm/agent/noVNC/docs/API.md +++ /dev/null @@ -1,375 +0,0 @@ -# noVNC API - -The interface of the noVNC client consists of a single RFB object that -is instantiated once per connection. - -## RFB - -The `RFB` object represents a single connection to a VNC server. It -communicates using a WebSocket that must provide a standard RFB -protocol stream. - -### Constructor - -[`RFB()`](#rfb-1) - - Creates and returns a new `RFB` object. - -### Properties - -`viewOnly` - - Is a `boolean` indicating if any events (e.g. key presses or mouse - movement) should be prevented from being sent to the server. - Disabled by default. - -`focusOnClick` - - Is a `boolean` indicating if keyboard focus should automatically be - moved to the remote session when a `mousedown` or `touchstart` - event is received. - -`touchButton` - - Is a `long` controlling the button mask that should be simulated - when a touch event is recieved. Uses the same values as - [`MouseEvent.button`](https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent/button). - Is set to `1` by default. - -`clipViewport` - - Is a `boolean` indicating if the remote session should be clipped - to its container. When disabled scrollbars will be shown to handle - the resulting overflow. Disabled by default. - -`dragViewport` - - Is a `boolean` indicating if mouse events should control the - relative position of a clipped remote session. Only relevant if - `clipViewport` is enabled. Disabled by default. - -`scaleViewport` - - Is a `boolean` indicating if the remote session should be scaled - locally so it fits its container. When disabled it will be centered - if the remote session is smaller than its container, or handled - according to `clipViewport` if it is larger. Disabled by default. - -`resizeSession` - - Is a `boolean` indicating if a request to resize the remote session - should be sent whenever the container changes dimensions. Disabled - by default. - -`showDotCursor` - - Is a `boolean` indicating whether a dot cursor should be shown - instead of a zero-sized or fully-transparent cursor if the server - sets such invisible cursor. Disabled by default. - -`background` - - Is a valid CSS [background](https://developer.mozilla.org/en-US/docs/Web/CSS/background) - style value indicating which background style should be applied - to the element containing the remote session screen. The default value is `rgb(40, 40, 40)` - (solid gray color). - -`capabilities` *Read only* - - Is an `Object` indicating which optional extensions are available - on the server. Some methods may only be called if the corresponding - capability is set. The following capabilities are defined: - - | name | type | description - | -------- | --------- | ----------- - | `power` | `boolean` | Machine power control is available - -### Events - -[`connect`](#connect) - - The `connect` event is fired when the `RFB` object has completed - the connection and handshaking with the server. - -[`disconnect`](#disconnected) - - The `disconnect` event is fired when the `RFB` object disconnects. - -[`credentialsrequired`](#credentialsrequired) - - The `credentialsrequired` event is fired when more credentials must - be given to continue. - -[`securityfailure`](#securityfailure) - - The `securityfailure` event is fired when the security negotiation - with the server fails. - -[`clipboard`](#clipboard) - - The `clipboard` event is fired when clipboard data is received from - the server. - -[`bell`](#bell) - - The `bell` event is fired when a audible bell request is received - from the server. - -[`desktopname`](#desktopname) - - The `desktopname` event is fired when the remote desktop name - changes. - -[`capabilities`](#capabilities) - - The `capabilities` event is fired when `RFB.capabilities` is - updated. - -### Methods - -[`RFB.disconnect()`](#rfbdisconnect) - - Disconnect from the server. - -[`RFB.sendCredentials()`](#rfbsendcredentials) - - Send credentials to server. Should be called after the - [`credentialsrequired`](#credentialsrequired) event has fired. - -[`RFB.sendKey()`](#rfbsendKey) - - Send a key event. - -[`RFB.sendCtrlAltDel()`](#rfbsendctrlaltdel) - - Send Ctrl-Alt-Del key sequence. - -[`RFB.focus()`](#rfbfocus) - - Move keyboard focus to the remote session. - -[`RFB.blur()`](#rfbblur) - - Remove keyboard focus from the remote session. - -[`RFB.machineShutdown()`](#rfbmachineshutdown) - - Request a shutdown of the remote machine. - -[`RFB.machineReboot()`](#rfbmachinereboot) - - Request a reboot of the remote machine. - -[`RFB.machineReset()`](#rfbmachinereset) - - Request a reset of the remote machine. - -[`RFB.clipboardPasteFrom()`](#rfbclipboardPasteFrom) - - Send clipboard contents to server. - -### Details - -#### RFB() - -The `RFB()` constructor returns a new `RFB` object and initiates a new -connection to a specified VNC server. - -##### Syntax - - let rfb = new RFB( target, url [, options] ); - -###### Parameters - -**`target`** - - A block [`HTMLElement`](https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement) - that specifies where the `RFB` object should attach itself. The - existing contents of the `HTMLElement` will be untouched, but new - elements will be added during the lifetime of the `RFB` object. - -**`url`** - - A `DOMString` specifying the VNC server to connect to. This must be - a valid WebSocket URL. - -**`options`** *Optional* - - An `Object` specifying extra details about how the connection - should be made. - - Possible options: - - `shared` - - A `boolean` indicating if the remote server should be shared or - if any other connected clients should be disconnected. Enabled - by default. - - `credentials` - - An `Object` specifying the credentials to provide to the server - when authenticating. The following credentials are possible: - - | name | type | description - | ------------ | ----------- | ----------- - | `"username"` | `DOMString` | The user that authenticates - | `"password"` | `DOMString` | Password for the user - | `"target"` | `DOMString` | Target machine or session - - `repeaterID` - - A `DOMString` specifying the ID to provide to any VNC repeater - encountered. - -#### connect - -The `connect` event is fired after all the handshaking with the server -is completed and the connection is fully established. After this event -the `RFB` object is ready to recieve graphics updates and to send input. - -#### disconnect - -The `disconnect` event is fired when the connection has been -terminated. The `detail` property is an `Object` that contains the -property `clean`. `clean` is a `boolean` indicating if the termination -was clean or not. In the event of an unexpected termination or an error -`clean` will be set to false. - -#### credentialsrequired - -The `credentialsrequired` event is fired when the server requests more -credentials than were specified to [`RFB()`](#rfb-1). The `detail` -property is an `Object` containing the property `types` which is an -`Array` of `DOMString` listing the credentials that are required. - -#### securityfailure - -The `securityfailure` event is fired when the handshaking process with -the server fails during the security negotiation step. The `detail` -property is an `Object` containing the following properties: - -| Property | Type | Description -| -------- | ----------- | ----------- -| `status` | `long` | The failure status code -| `reason` | `DOMString` | The **optional** reason for the failure - -The property `status` corresponds to the -[SecurityResult](https://github.com/rfbproto/rfbproto/blob/master/rfbproto.rst#securityresult) -status code in cases of failure. A status of zero will not be sent in -this event since that indicates a successful security handshaking -process. The optional property `reason` is provided by the server and -thus the language of the string is not known. However most servers will -probably send English strings. The server can choose to not send a -reason and in these cases the `reason` property will be omitted. - -#### clipboard - -The `clipboard` event is fired when the server has sent clipboard data. -The `detail` property is an `Object` containing the property `text` -which is a `DOMString` with the clipboard data. - -#### bell - -The `bell` event is fired when the server has requested an audible -bell. - -#### desktopname - -The `desktopname` event is fired when the name of the remote desktop -changes. The `detail` property is an `Object` with the property `name` -which is a `DOMString` specifying the new name. - -#### capabilities - -The `capabilities` event is fired whenever an entry is added or removed -from `RFB.capabilities`. The `detail` property is an `Object` with the -property `capabilities` containing the new value of `RFB.capabilities`. - -#### RFB.disconnect() - -The `RFB.disconnect()` method is used to disconnect from the currently -connected server. - -##### Syntax - - RFB.disconnect( ); - -#### RFB.sendCredentials() - -The `RFB.sendCredentials()` method is used to provide the missing -credentials after a `credentialsrequired` event has been fired. - -##### Syntax - - RFB.sendCredentials( credentials ); - -###### Parameters - -**`credentials`** - - An `Object` specifying the credentials to provide to the server - when authenticating. See [`RFB()`](#rfb-1) for details. - -#### RFB.sendKey() - -The `RFB.sendKey()` method is used to send a key event to the server. - -##### Syntax - - RFB.sendKey( keysym, code [, down] ); - -###### Parameters - -**`keysym`** - - A `long` specifying the RFB keysym to send. Can be `0` if a valid - **`code`** is specified. - -**`code`** - - A `DOMString` specifying the physical key to send. Valid values are - those that can be specified to - [`KeyboardEvent.code`](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/code). - If the physical key cannot be determined then `null` shall be - specified. - -**`down`** *Optional* - - A `boolean` specifying if a press or a release event should be - sent. If omitted then both a press and release event are sent. - -#### RFB.sendCtrlAltDel() - -The `RFB.sendCtrlAltDel()` method is used to send the key sequence -*left Control*, *left Alt*, *Delete*. This is a convenience wrapper -around [`RFB.sendKey()`](#rfbsendkey). - -##### Syntax - - RFB.sendCtrlAltDel( ); - -#### RFB.focus() - -The `RFB.focus()` method sets the keyboard focus on the remote session. -Keyboard events will be sent to the remote server after this point. - -##### Syntax - - RFB.focus( ); - -#### RFB.blur() - -The `RFB.blur()` method remove keyboard focus on the remote session. -Keyboard events will no longer be sent to the remote server after this -point. - -##### Syntax - - RFB.blur( ); - -#### RFB.machineShutdown() - -The `RFB.machineShutdown()` method is used to request to shut down the -remote machine. The capability `power` must be set for this method to -have any effect. - -##### Syntax - - RFB.machineShutdown( ); - -#### RFB.machineReboot() - -The `RFB.machineReboot()` method is used to request a clean reboot of -the remote machine. The capability `power` must be set for this method -to have any effect. - -##### Syntax - - RFB.machineReboot( ); - -#### RFB.machineReset() - -The `RFB.machineReset()` method is used to request a forced reset of -the remote machine. The capability `power` must be set for this method -to have any effect. - -##### Syntax - - RFB.machineReset( ); - -#### RFB.clipboardPasteFrom() - -The `RFB.clipboardPasteFrom()` method is used to send clipboard data -to the remote server. - -##### Syntax - - RFB.clipboardPasteFrom( text ); - -###### Parameters - -**`text`** - - A `DOMString` specifying the clipboard data to send. Currently only - characters from ISO 8859-1 are supported. diff --git a/systemvm/agent/noVNC/docs/EMBEDDING.md b/systemvm/agent/noVNC/docs/EMBEDDING.md deleted file mode 100644 index 5399b48ba76c..000000000000 --- a/systemvm/agent/noVNC/docs/EMBEDDING.md +++ /dev/null @@ -1,119 +0,0 @@ -# Embedding and Deploying noVNC Application - -This document describes how to embed and deploy the noVNC application, which -includes settings and a full user interface. If you are looking for -documentation on how to use the core noVNC library in your own application, -then please see our [library documentation](LIBRARY.md). - -## Files - -The noVNC application consists of the following files and directories: - -* `vnc.html` - The main page for the application and where users should go. It - is possible to rename this file. - -* `app/` - Support files for the application. Contains code, images, styles and - translations. - -* `core/` - The core noVNC library. - -* `vendor/` - Third party support libraries used by the application and the - core library. - -The most basic deployment consists of simply serving these files from a web -server and setting up a WebSocket proxy to the VNC server. - -## Parameters - -The noVNC application can be controlled by including certain settings in the -query string. Currently the following options are available: - -* `autoconnect` - Automatically connect as soon as the page has finished - loading. - -* `reconnect` - If noVNC should automatically reconnect if the connection is - dropped. - -* `reconnect_delay` - How long to wait in milliseconds before attempting to - reconnect. - -* `host` - The WebSocket host to connect to. - -* `port` - The WebSocket port to connect to. - -* `encrypt` - If TLS should be used for the WebSocket connection. - -* `path` - The WebSocket path to use. - -* `password` - The password sent to the server, if required. - -* `repeaterID` - The repeater ID to use if a VNC repeater is detected. - -* `shared` - If other VNC clients should be disconnected when noVNC connects. - -* `bell` - If the keyboard bell should be enabled or not. - -* `view_only` - If the remote session should be in non-interactive mode. - -* `view_clip` - If the remote session should be clipped or use scrollbars if - it cannot fit in the browser. - -* `resize` - How to resize the remote session if it is not the same size as - the browser window. Can be one of `off`, `scale` and `remote`. - -* `show_dot` - If a dot cursor should be shown when the remote server provides - no local cursor, or provides a fully-transparent (invisible) cursor. - -* `logging` - The console log level. Can be one of `error`, `warn`, `info` or - `debug`. - -## Pre-conversion of Modules - -noVNC is written using ECMAScript 6 modules. Many of the major browsers support -these modules natively, but not all. By default the noVNC application includes -a script that can convert these modules to an older format as they are being -loaded. However this process can be slow and severely increases the load time -for the application. - -It is possible to perform this conversion ahead of time, avoiding the extra -load times. To do this please follow these steps: - - 1. Install Node.js - 2. Run `npm install` in the noVNC directory - 3. Run `./utils/use_require.js --with-app --as commonjs` - -This will produce a `build/` directory that includes everything needed to run -the noVNC application. - -## HTTP Serving Considerations -### Browser Cache Issue - -If you serve noVNC files using a web server that provides an ETag header, and -include any options in the query string, a nasty browser cache issue can bite -you on upgrade, resulting in a red error box. The issue is caused by a mismatch -between the new vnc.html (which is reloaded because the user has used it with -new query string after the upgrade) and the old javascript files (that the -browser reuses from its cache). To avoid this issue, the browser must be told -to always revalidate cached files using conditional requests. The correct -semantics are achieved via the (confusingly named) `Cache-Control: no-cache` -header that needs to be provided in the web server responses. - -### Example Server Configurations - -Apache: - -``` - # In the main configuration file - # (Debian/Ubuntu users: use "a2enmod headers" instead) - LoadModule headers_module modules/mod_headers.so - - # In the or block related to noVNC - Header set Cache-Control "no-cache" -``` - -Nginx: - -``` - # In the location block related to noVNC - add_header Cache-Control no-cache; -``` diff --git a/systemvm/agent/noVNC/docs/LIBRARY.md b/systemvm/agent/noVNC/docs/LIBRARY.md deleted file mode 100644 index 63f55e8f1798..000000000000 --- a/systemvm/agent/noVNC/docs/LIBRARY.md +++ /dev/null @@ -1,35 +0,0 @@ -# Using the noVNC JavaScript library - -This document describes how to make use of the noVNC JavaScript library for -integration in your own VNC client application. If you wish to embed the more -complete noVNC application with its included user interface then please see -our [embedding documentation](EMBEDDING.md). - -## API - -The API of noVNC consists of a single object called `RFB`. The formal -documentation for that object can be found in our [API documentation](API.md). - -## Example - -noVNC includes a small example application called `vnc_lite.html`. This does -not make use of all the features of noVNC, but is a good start to see how to -do things. - -## Conversion of Modules - -noVNC is written using ECMAScript 6 modules. Many of the major browsers support -these modules natively, but not all. They are also not supported by Node.js. To -use noVNC in these places the library must first be converted. - -Fortunately noVNC includes a script to handle this conversion. Please follow -the following steps: - - 1. Install Node.js - 2. Run `npm install` in the noVNC directory - 3. Run `./utils/use_require.js --as ` - -Several module formats are available. Please run -`./utils/use_require.js --help` to see them all. - -The result of the conversion is available in the `lib/` directory. diff --git a/systemvm/agent/noVNC/docs/LICENSE.BSD-2-Clause b/systemvm/agent/noVNC/docs/LICENSE.BSD-2-Clause deleted file mode 100644 index 9d66ec911bf4..000000000000 --- a/systemvm/agent/noVNC/docs/LICENSE.BSD-2-Clause +++ /dev/null @@ -1,22 +0,0 @@ -Copyright (c) , -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY -DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/systemvm/agent/noVNC/docs/LICENSE.BSD-3-Clause b/systemvm/agent/noVNC/docs/LICENSE.BSD-3-Clause deleted file mode 100644 index e160466c4e06..000000000000 --- a/systemvm/agent/noVNC/docs/LICENSE.BSD-3-Clause +++ /dev/null @@ -1,24 +0,0 @@ -Copyright (c) , -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL BE LIABLE FOR ANY -DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/systemvm/agent/noVNC/docs/LICENSE.MPL-2.0 b/systemvm/agent/noVNC/docs/LICENSE.MPL-2.0 deleted file mode 100644 index 14e2f777f6c3..000000000000 --- a/systemvm/agent/noVNC/docs/LICENSE.MPL-2.0 +++ /dev/null @@ -1,373 +0,0 @@ -Mozilla Public License Version 2.0 -================================== - -1. Definitions --------------- - -1.1. "Contributor" - means each individual or legal entity that creates, contributes to - the creation of, or owns Covered Software. - -1.2. "Contributor Version" - means the combination of the Contributions of others (if any) used - by a Contributor and that particular Contributor's Contribution. - -1.3. "Contribution" - means Covered Software of a particular Contributor. - -1.4. "Covered Software" - means Source Code Form to which the initial Contributor has attached - the notice in Exhibit A, the Executable Form of such Source Code - Form, and Modifications of such Source Code Form, in each case - including portions thereof. - -1.5. "Incompatible With Secondary Licenses" - means - - (a) that the initial Contributor has attached the notice described - in Exhibit B to the Covered Software; or - - (b) that the Covered Software was made available under the terms of - version 1.1 or earlier of the License, but not also under the - terms of a Secondary License. - -1.6. "Executable Form" - means any form of the work other than Source Code Form. - -1.7. "Larger Work" - means a work that combines Covered Software with other material, in - a separate file or files, that is not Covered Software. - -1.8. "License" - means this document. - -1.9. "Licensable" - means having the right to grant, to the maximum extent possible, - whether at the time of the initial grant or subsequently, any and - all of the rights conveyed by this License. - -1.10. "Modifications" - means any of the following: - - (a) any file in Source Code Form that results from an addition to, - deletion from, or modification of the contents of Covered - Software; or - - (b) any new file in Source Code Form that contains any Covered - Software. - -1.11. "Patent Claims" of a Contributor - means any patent claim(s), including without limitation, method, - process, and apparatus claims, in any patent Licensable by such - Contributor that would be infringed, but for the grant of the - License, by the making, using, selling, offering for sale, having - made, import, or transfer of either its Contributions or its - Contributor Version. - -1.12. "Secondary License" - means either the GNU General Public License, Version 2.0, the GNU - Lesser General Public License, Version 2.1, the GNU Affero General - Public License, Version 3.0, or any later versions of those - licenses. - -1.13. "Source Code Form" - means the form of the work preferred for making modifications. - -1.14. "You" (or "Your") - means an individual or a legal entity exercising rights under this - License. For legal entities, "You" includes any entity that - controls, is controlled by, or is under common control with You. For - purposes of this definition, "control" means (a) the power, direct - or indirect, to cause the direction or management of such entity, - whether by contract or otherwise, or (b) ownership of more than - fifty percent (50%) of the outstanding shares or beneficial - ownership of such entity. - -2. License Grants and Conditions --------------------------------- - -2.1. Grants - -Each Contributor hereby grants You a world-wide, royalty-free, -non-exclusive license: - -(a) under intellectual property rights (other than patent or trademark) - Licensable by such Contributor to use, reproduce, make available, - modify, display, perform, distribute, and otherwise exploit its - Contributions, either on an unmodified basis, with Modifications, or - as part of a Larger Work; and - -(b) under Patent Claims of such Contributor to make, use, sell, offer - for sale, have made, import, and otherwise transfer either its - Contributions or its Contributor Version. - -2.2. Effective Date - -The licenses granted in Section 2.1 with respect to any Contribution -become effective for each Contribution on the date the Contributor first -distributes such Contribution. - -2.3. Limitations on Grant Scope - -The licenses granted in this Section 2 are the only rights granted under -this License. No additional rights or licenses will be implied from the -distribution or licensing of Covered Software under this License. -Notwithstanding Section 2.1(b) above, no patent license is granted by a -Contributor: - -(a) for any code that a Contributor has removed from Covered Software; - or - -(b) for infringements caused by: (i) Your and any other third party's - modifications of Covered Software, or (ii) the combination of its - Contributions with other software (except as part of its Contributor - Version); or - -(c) under Patent Claims infringed by Covered Software in the absence of - its Contributions. - -This License does not grant any rights in the trademarks, service marks, -or logos of any Contributor (except as may be necessary to comply with -the notice requirements in Section 3.4). - -2.4. Subsequent Licenses - -No Contributor makes additional grants as a result of Your choice to -distribute the Covered Software under a subsequent version of this -License (see Section 10.2) or under the terms of a Secondary License (if -permitted under the terms of Section 3.3). - -2.5. Representation - -Each Contributor represents that the Contributor believes its -Contributions are its original creation(s) or it has sufficient rights -to grant the rights to its Contributions conveyed by this License. - -2.6. Fair Use - -This License is not intended to limit any rights You have under -applicable copyright doctrines of fair use, fair dealing, or other -equivalents. - -2.7. Conditions - -Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted -in Section 2.1. - -3. Responsibilities -------------------- - -3.1. Distribution of Source Form - -All distribution of Covered Software in Source Code Form, including any -Modifications that You create or to which You contribute, must be under -the terms of this License. You must inform recipients that the Source -Code Form of the Covered Software is governed by the terms of this -License, and how they can obtain a copy of this License. You may not -attempt to alter or restrict the recipients' rights in the Source Code -Form. - -3.2. Distribution of Executable Form - -If You distribute Covered Software in Executable Form then: - -(a) such Covered Software must also be made available in Source Code - Form, as described in Section 3.1, and You must inform recipients of - the Executable Form how they can obtain a copy of such Source Code - Form by reasonable means in a timely manner, at a charge no more - than the cost of distribution to the recipient; and - -(b) You may distribute such Executable Form under the terms of this - License, or sublicense it under different terms, provided that the - license for the Executable Form does not attempt to limit or alter - the recipients' rights in the Source Code Form under this License. - -3.3. Distribution of a Larger Work - -You may create and distribute a Larger Work under terms of Your choice, -provided that You also comply with the requirements of this License for -the Covered Software. If the Larger Work is a combination of Covered -Software with a work governed by one or more Secondary Licenses, and the -Covered Software is not Incompatible With Secondary Licenses, this -License permits You to additionally distribute such Covered Software -under the terms of such Secondary License(s), so that the recipient of -the Larger Work may, at their option, further distribute the Covered -Software under the terms of either this License or such Secondary -License(s). - -3.4. Notices - -You may not remove or alter the substance of any license notices -(including copyright notices, patent notices, disclaimers of warranty, -or limitations of liability) contained within the Source Code Form of -the Covered Software, except that You may alter any license notices to -the extent required to remedy known factual inaccuracies. - -3.5. Application of Additional Terms - -You may choose to offer, and to charge a fee for, warranty, support, -indemnity or liability obligations to one or more recipients of Covered -Software. However, You may do so only on Your own behalf, and not on -behalf of any Contributor. You must make it absolutely clear that any -such warranty, support, indemnity, or liability obligation is offered by -You alone, and You hereby agree to indemnify every Contributor for any -liability incurred by such Contributor as a result of warranty, support, -indemnity or liability terms You offer. You may include additional -disclaimers of warranty and limitations of liability specific to any -jurisdiction. - -4. Inability to Comply Due to Statute or Regulation ---------------------------------------------------- - -If it is impossible for You to comply with any of the terms of this -License with respect to some or all of the Covered Software due to -statute, judicial order, or regulation then You must: (a) comply with -the terms of this License to the maximum extent possible; and (b) -describe the limitations and the code they affect. Such description must -be placed in a text file included with all distributions of the Covered -Software under this License. Except to the extent prohibited by statute -or regulation, such description must be sufficiently detailed for a -recipient of ordinary skill to be able to understand it. - -5. Termination --------------- - -5.1. The rights granted under this License will terminate automatically -if You fail to comply with any of its terms. However, if You become -compliant, then the rights granted under this License from a particular -Contributor are reinstated (a) provisionally, unless and until such -Contributor explicitly and finally terminates Your grants, and (b) on an -ongoing basis, if such Contributor fails to notify You of the -non-compliance by some reasonable means prior to 60 days after You have -come back into compliance. Moreover, Your grants from a particular -Contributor are reinstated on an ongoing basis if such Contributor -notifies You of the non-compliance by some reasonable means, this is the -first time You have received notice of non-compliance with this License -from such Contributor, and You become compliant prior to 30 days after -Your receipt of the notice. - -5.2. If You initiate litigation against any entity by asserting a patent -infringement claim (excluding declaratory judgment actions, -counter-claims, and cross-claims) alleging that a Contributor Version -directly or indirectly infringes any patent, then the rights granted to -You by any and all Contributors for the Covered Software under Section -2.1 of this License shall terminate. - -5.3. In the event of termination under Sections 5.1 or 5.2 above, all -end user license agreements (excluding distributors and resellers) which -have been validly granted by You or Your distributors under this License -prior to termination shall survive termination. - -************************************************************************ -* * -* 6. Disclaimer of Warranty * -* ------------------------- * -* * -* Covered Software is provided under this License on an "as is" * -* basis, without warranty of any kind, either expressed, implied, or * -* statutory, including, without limitation, warranties that the * -* Covered Software is free of defects, merchantable, fit for a * -* particular purpose or non-infringing. The entire risk as to the * -* quality and performance of the Covered Software is with You. * -* Should any Covered Software prove defective in any respect, You * -* (not any Contributor) assume the cost of any necessary servicing, * -* repair, or correction. This disclaimer of warranty constitutes an * -* essential part of this License. No use of any Covered Software is * -* authorized under this License except under this disclaimer. * -* * -************************************************************************ - -************************************************************************ -* * -* 7. Limitation of Liability * -* -------------------------- * -* * -* Under no circumstances and under no legal theory, whether tort * -* (including negligence), contract, or otherwise, shall any * -* Contributor, or anyone who distributes Covered Software as * -* permitted above, be liable to You for any direct, indirect, * -* special, incidental, or consequential damages of any character * -* including, without limitation, damages for lost profits, loss of * -* goodwill, work stoppage, computer failure or malfunction, or any * -* and all other commercial damages or losses, even if such party * -* shall have been informed of the possibility of such damages. This * -* limitation of liability shall not apply to liability for death or * -* personal injury resulting from such party's negligence to the * -* extent applicable law prohibits such limitation. Some * -* jurisdictions do not allow the exclusion or limitation of * -* incidental or consequential damages, so this exclusion and * -* limitation may not apply to You. * -* * -************************************************************************ - -8. Litigation -------------- - -Any litigation relating to this License may be brought only in the -courts of a jurisdiction where the defendant maintains its principal -place of business and such litigation shall be governed by laws of that -jurisdiction, without reference to its conflict-of-law provisions. -Nothing in this Section shall prevent a party's ability to bring -cross-claims or counter-claims. - -9. Miscellaneous ----------------- - -This License represents the complete agreement concerning the subject -matter hereof. If any provision of this License is held to be -unenforceable, such provision shall be reformed only to the extent -necessary to make it enforceable. Any law or regulation which provides -that the language of a contract shall be construed against the drafter -shall not be used to construe this License against a Contributor. - -10. Versions of the License ---------------------------- - -10.1. New Versions - -Mozilla Foundation is the license steward. Except as provided in Section -10.3, no one other than the license steward has the right to modify or -publish new versions of this License. Each version will be given a -distinguishing version number. - -10.2. Effect of New Versions - -You may distribute the Covered Software under the terms of the version -of the License under which You originally received the Covered Software, -or under the terms of any subsequent version published by the license -steward. - -10.3. Modified Versions - -If you create software not governed by this License, and you want to -create a new license for such software, you may create and use a -modified version of this License if you rename the license and remove -any references to the name of the license steward (except to note that -such modified license differs from this License). - -10.4. Distributing Source Code Form that is Incompatible With Secondary -Licenses - -If You choose to distribute Source Code Form that is Incompatible With -Secondary Licenses under the terms of this version of the License, the -notice described in Exhibit B of this License must be attached. - -Exhibit A - Source Code Form License Notice -------------------------------------------- - - This Source Code Form is subject to the terms of the Mozilla Public - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. - -If it is not possible or desirable to put the notice in a particular -file, then You may include the notice in a location (such as a LICENSE -file in a relevant directory) where a recipient would be likely to look -for such a notice. - -You may add additional accurate notices of copyright ownership. - -Exhibit B - "Incompatible With Secondary Licenses" Notice ---------------------------------------------------------- - - This Source Code Form is "Incompatible With Secondary Licenses", as - defined by the Mozilla Public License, v. 2.0. diff --git a/systemvm/agent/noVNC/docs/LICENSE.OFL-1.1 b/systemvm/agent/noVNC/docs/LICENSE.OFL-1.1 deleted file mode 100644 index 77b17316cf1e..000000000000 --- a/systemvm/agent/noVNC/docs/LICENSE.OFL-1.1 +++ /dev/null @@ -1,91 +0,0 @@ -This Font Software is licensed under the SIL Open Font License, Version 1.1. -This license is copied below, and is also available with a FAQ at: -http://scripts.sil.org/OFL - - ------------------------------------------------------------ -SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 ------------------------------------------------------------ - -PREAMBLE -The goals of the Open Font License (OFL) are to stimulate worldwide -development of collaborative font projects, to support the font creation -efforts of academic and linguistic communities, and to provide a free and -open framework in which fonts may be shared and improved in partnership -with others. - -The OFL allows the licensed fonts to be used, studied, modified and -redistributed freely as long as they are not sold by themselves. The -fonts, including any derivative works, can be bundled, embedded, -redistributed and/or sold with any software provided that any reserved -names are not used by derivative works. The fonts and derivatives, -however, cannot be released under any other type of license. The -requirement for fonts to remain under this license does not apply -to any document created using the fonts or their derivatives. - -DEFINITIONS -"Font Software" refers to the set of files released by the Copyright -Holder(s) under this license and clearly marked as such. This may -include source files, build scripts and documentation. - -"Reserved Font Name" refers to any names specified as such after the -copyright statement(s). - -"Original Version" refers to the collection of Font Software components as -distributed by the Copyright Holder(s). - -"Modified Version" refers to any derivative made by adding to, deleting, -or substituting -- in part or in whole -- any of the components of the -Original Version, by changing formats or by porting the Font Software to a -new environment. - -"Author" refers to any designer, engineer, programmer, technical -writer or other person who contributed to the Font Software. - -PERMISSION & CONDITIONS -Permission is hereby granted, free of charge, to any person obtaining -a copy of the Font Software, to use, study, copy, merge, embed, modify, -redistribute, and sell modified and unmodified copies of the Font -Software, subject to the following conditions: - -1) Neither the Font Software nor any of its individual components, -in Original or Modified Versions, may be sold by itself. - -2) Original or Modified Versions of the Font Software may be bundled, -redistributed and/or sold with any software, provided that each copy -contains the above copyright notice and this license. These can be -included either as stand-alone text files, human-readable headers or -in the appropriate machine-readable metadata fields within text or -binary files as long as those fields can be easily viewed by the user. - -3) No Modified Version of the Font Software may use the Reserved Font -Name(s) unless explicit written permission is granted by the corresponding -Copyright Holder. This restriction only applies to the primary font name as -presented to the users. - -4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font -Software shall not be used to promote, endorse or advertise any -Modified Version, except to acknowledge the contribution(s) of the -Copyright Holder(s) and the Author(s) or with their explicit written -permission. - -5) The Font Software, modified or unmodified, in part or in whole, -must be distributed entirely under this license, and must not be -distributed under any other license. The requirement for fonts to -remain under this license does not apply to any document created -using the Font Software. - -TERMINATION -This license becomes null and void if any of the above conditions are -not met. - -DISCLAIMER -THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT -OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE -COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL -DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM -OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/systemvm/agent/noVNC/docs/flash_policy.txt b/systemvm/agent/noVNC/docs/flash_policy.txt deleted file mode 100644 index df325c0ddf50..000000000000 --- a/systemvm/agent/noVNC/docs/flash_policy.txt +++ /dev/null @@ -1,4 +0,0 @@ -Manual setup: - -DATA="echo \'\'" -/usr/bin/socat -T 1 TCP-L:843,reuseaddr,fork,crlf SYSTEM:"$DATA" diff --git a/systemvm/agent/noVNC/docs/links b/systemvm/agent/noVNC/docs/links deleted file mode 100644 index 31544ce0e12b..000000000000 --- a/systemvm/agent/noVNC/docs/links +++ /dev/null @@ -1,76 +0,0 @@ -New tight PNG protocol: - http://wiki.qemu.org/VNC_Tight_PNG - http://xf.iksaif.net/blog/index.php?post/2010/06/14/QEMU:-Tight-PNG-and-some-profiling - -RFB protocol and extensions: - http://tigervnc.org/cgi-bin/rfbproto - -Canvas Browser Compatibility: - http://philip.html5.org/tests/canvas/suite/tests/results.html - -WebSockets API standard: - http://www.whatwg.org/specs/web-apps/current-work/complete.html#websocket - http://dev.w3.org/html5/websockets/ - http://www.ietf.org/id/draft-ietf-hybi-thewebsocketprotocol-00.txt - -Browser Keyboard Events detailed: - http://unixpapa.com/js/key.html - -ActionScript (Flash) WebSocket implementation: - http://github.com/gimite/web-socket-js - -ActionScript (Flash) crypto/TLS library: - http://code.google.com/p/as3crypto - http://github.com/lyokato/as3crypto_patched - -TLS Protocol: - http://en.wikipedia.org/wiki/Transport_Layer_Security - -Generate self-signed certificate: - http://docs.python.org/dev/library/ssl.html#certificates - -Cursor appearance/style (for Cursor pseudo-encoding): - http://en.wikipedia.org/wiki/ICO_(file_format) - http://www.daubnet.com/en/file-format-cur - https://developer.mozilla.org/en/Using_URL_values_for_the_cursor_property - http://www.fileformat.info/format/bmp/egff.htm - -Icon/Cursor file format: - http://msdn.microsoft.com/en-us/library/ms997538 - http://msdn.microsoft.com/en-us/library/aa921550.aspx - http://msdn.microsoft.com/en-us/library/aa930622.aspx - - -RDP Protocol specification: - http://msdn.microsoft.com/en-us/library/cc240445(v=PROT.10).aspx - - -Related projects: - - guacamole: http://guacamole.sourceforge.net/ - - - Web client, but Java servlet does pre-processing - - jsvnc: http://code.google.com/p/jsvnc/ - - - No releases - - webvnc: http://code.google.com/p/webvnc/ - - - Jetty web server gateway, no updates since April 2008. - - RealVNC Java applet: http://www.realvnc.com/support/javavncviewer.html - - - Java applet - - Flashlight-VNC: http://www.wizhelp.com/flashlight-vnc/ - - - Adobe Flash implementation - - FVNC: http://osflash.org/fvnc - - - Adbove Flash implementation - - CanVNC: http://canvnc.sourceforge.net/ - - - HTML client with REST to VNC python proxy. Mostly vapor. diff --git a/systemvm/agent/noVNC/docs/notes b/systemvm/agent/noVNC/docs/notes deleted file mode 100644 index dfef0bd6afe0..000000000000 --- a/systemvm/agent/noVNC/docs/notes +++ /dev/null @@ -1,5 +0,0 @@ -Rebuilding inflator.js - -- Download pako from npm -- Install browserify using npm -- browserify core/inflator.mod.js -o core/inflator.js -s Inflator diff --git a/systemvm/agent/noVNC/docs/rfb_notes b/systemvm/agent/noVNC/docs/rfb_notes deleted file mode 100644 index 643e16c01e72..000000000000 --- a/systemvm/agent/noVNC/docs/rfb_notes +++ /dev/null @@ -1,147 +0,0 @@ -5.1.1 ProtocolVersion: 12, 12 bytes - - - Sent by server, max supported - 12 ascii - "RFB 003.008\n" - - Response by client, version to use - 12 ascii - "RFB 003.003\n" - -5.1.2 Authentication: >=4, [16, 4] bytes - - - Sent by server - CARD32 - authentication-scheme - 0 - connection failed - CARD32 - length - length - reason - 1 - no authentication - - 2 - VNC authentication - 16 CARD8 - challenge (random bytes) - - - Response by client (if VNC authentication) - 16 CARD8 - client encrypts the challenge with DES, using user - password as key, sends resulting 16 byte response - - - Response by server (if VNC authentication) - CARD32 - 0 - OK - 1 - failed - 2 - too-many - -5.1.3 ClientInitialisation: 1 byte - - Sent by client - CARD8 - shared-flag, 0 exclusive, non-zero shared - -5.1.4 ServerInitialisation: >=24 bytes - - Sent by server - CARD16 - framebuffer-width - CARD16 - framebuffer-height - 16 byte PIXEL_FORMAT - server-pixel-format - CARD8 - bits-per-pixel - CARD8 - depth - CARD8 - big-endian-flag, non-zero is big endian - CARD8 - true-color-flag, non-zero then next 6 apply - CARD16 - red-max - CARD16 - green-max - CARD16 - blue-max - CARD8 - red-shift - CARD8 - green-shift - CARD8 - blue-shift - 3 bytes - padding - CARD32 - name-length - - CARD8[length] - name-string - - - -Client to Server Messages: - -5.2.1 SetPixelFormat: 20 bytes - CARD8: 0 - message-type - ... - -5.2.2 FixColourMapEntries: >=6 bytes - CARD8: 1 - message-type - ... - -5.2.3 SetEncodings: >=8 bytes - CARD8: 2 - message-type - CARD8 - padding - CARD16 - numer-of-encodings - - CARD32 - encoding-type in preference order - 0 - raw - 1 - copy-rectangle - 2 - RRE - 4 - CoRRE - 5 - hextile - -5.2.4 FramebufferUpdateRequest (10 bytes) - CARD8: 3 - message-type - CARD8 - incremental (0 for full-update, non-zero for incremental) - CARD16 - x-position - CARD16 - y-position - CARD16 - width - CARD16 - height - - -5.2.5 KeyEvent: 8 bytes - CARD8: 4 - message-type - CARD8 - down-flag - 2 bytes - padding - CARD32 - key (X-Windows keysym values) - -5.2.6 PointerEvent: 6 bytes - CARD8: 5 - message-type - CARD8 - button-mask - CARD16 - x-position - CARD16 - y-position - -5.2.7 ClientCutText: >=9 bytes - CARD8: 6 - message-type - ... - - -Server to Client Messages: - -5.3.1 FramebufferUpdate - CARD8: 0 - message-type - 1 byte - padding - CARD16 - number-of-rectangles - - CARD16 - x-position - CARD16 - y-position - CARD16 - width - CARD16 - height - CARD16 - encoding-type: - 0 - raw - 1 - copy rectangle - 2 - RRE - 4 - CoRRE - 5 - hextile - - raw: - - width x height pixel values - - copy rectangle: - CARD16 - src-x-position - CARD16 - src-y-position - - RRE: - CARD32 - N number-of-subrectangles - Nxd bytes - background-pixel-value (d bits-per-pixel) - - ... - -5.3.2 SetColourMapEntries (no support) - CARD8: 1 - message-type - ... - -5.3.3 Bell - CARD8: 2 - message-type - -5.3.4 ServerCutText - CARD8: 3 - message-type - - - - - diff --git a/systemvm/agent/noVNC/docs/rfbproto-3.3.pdf b/systemvm/agent/noVNC/docs/rfbproto-3.3.pdf deleted file mode 100644 index 56b876436a9b18e3fbc0001efa9c3dba498e3558..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 110778 zcmb4qW0Yn=v|Zb_rfu7{ZQK0XJ?&}Rw%yaVZQHi(%zMd8R#x&O`FC#JI(OAQ`&8Ac zy-$%Tii*=Q(KExtknJDLEWpDs6EYGy7+b@`@bbdLFvyzOTew&fa7 z5Hg6{8o8K>nwdD5n!&^H^TWe9y8z6L?BHP}!!I>902|^cJ{rm2z_EhX;3oEI=^A7g zRb3ZbRm3CZ^$&t7NxhncO{D0_eq#o0Th5@2K%=(S#67li7-2bQ3oR^L0}~ey4VVm` z;`J9B4=lto741SrPPgbTX zTJx&tFFq^Eq%(RtgWPLml7Ieg;5ScP`P@xB*)WP!!)GYzrzTmjS&*qL0}-NJA;SvE zWZy)a-{AcBr9*YxaoXp zYIu5CGH>8!1=7|a4{Sg5gsufK*g=QUoov~_jTDv1hf6xoYh_e?>#6xx(*1!ER-W(X zGl}7G-oZe*#RL!SxsnJ&T4<&>bkE+|tgb>2I$8s#Yikh(ngjU+8zUDr0zfUj;qRmg z<>3{CKn|hRWgJg-C%1y{=+d`F_Zn*;JiF%4(IjrQkB2XhU;Eu9c%}HyH2c2>tG;R= zX*1hXTLOsE2S^Oj^oiVSZ5=a3oQU??Hue*bIAUcqdk@>eQ9*dO-iI?0NrUTQY<9dG z5FEv1#CRZ+00_E7u-IY+-lLJQ2%`jLdH8Cas=Mimqdo>yd%$ksCwZOJP*h^u!b3qu z$&-kq?qj=OZY_Ud?N>%dHgsNGF+Uh&%Kcr{B=Gj6?gFIW^LruGO+#7p6;|0(#aqwT{!=|Ya?76wf@p2(suJuzl^2CdQ-sqOY-;aK+gQZkg zMMIe!@oCeh(%hi)Vm~4-wTQBzd`%nCXURnSyfUW1x(J&r5nM%t>bBADXPPRyI5(5t z03?GZi2Q|Gguh{KFAR6o!O30RI~et)d0}Lw%FfO5@0S2~mPKhy`L_B>7yeX4w?|eT zA3%e1LE~u;ZZ|NHP$#J&=t6$8{#w9GGr{4|XY|5dE zkuEye+Fd=Nhl0Pj0@?%Ri%sqwXpGa8;6ppsd8{?@psgI9?Ez@Fb0(usJ%r}TmfP~i zhA{5vkUud3#0MCOxkBx#bh>(!*{Z8rw~hnea39klCnOqftMhrBK((CBsXS3om|m;j z^WJRub=1$ch(lOj5(UUb`$*~3GxQCfsHgneP{!LquWc-wESoDu^EGo%qnz?@f$T({ zR?LdemRs}FbNL5@S|)S7M7Ukj?_~5TH^(-zHEtdOldL3870O_9T?@xbL&g4#foOER ziiVE|76jdV^b46??uy10;Jzyk74@3#k;|SC+}>L3&7QK+oL%c%^4~u)$y-ItT?D{= zx@suorIeK!W*y0{H-{wzOl0nssI`)Ys0^>O@7icuJ(Rk4P4zLzt-)&q2uU8$)xZSp z*~a}AM*>v9J3fhajK!~gC?KuPn4(zV*rBkzLW%)x+JWg48jb|NQ{!>){r-^lAKZsJ zuz<{HIMfeZBlr70={-MRr84|X_!*)D{cLl8V<=(l(vrNDe_IBcLiXxR?1!N}g*v)9L zp>K;SQPEx1GKk+gVypili@@oczaLLhpGsaf*9p)mbvySns3i*J`AJA zAzw+7S_vFxYGuiUyLn}O^nt5U`dlk9s$Y#kTC=;-iJQH&+6go@BReWGmE@D6)!{zx zi|&>fwpv;ZKeUt^7X*zjEOyg2NK2VtGDizMaUyP2VO>5}e(7YDM_cEO{94WjcGlXaI6tg3Twsq-KTSsJ2dld2Qqg=3iMBhElCYtgPyMl2~lS4p1Lth`C;za8f zKvR?P9fWUfZCowuIdJ`zamLT`3nT}=-}^g@tZ z(2%{&jz3O}hW?z<4PqehnTJ?G{tS(gh3KtG6*f;CPL&i!p@l=^ygcWm4$(D)p z7eUydh+|{n(KRi+TXSNJ0DC}C1oHG5j-EcSa4K0oz?Il8<_MaCz`v?$f5sb1a%qp~ zp*oX6u=o}IkD;3w-Z&O#D?fL;kzsq@jAcSxfw}v%&Wvxd#!snmP`}k&wA+()2UKt91KUYWLrhMF{G@vG9H^PKuH!Y*S!aGJV*QugEG=MoPMN2A=F(wEF;C+~tQu&V~#lHwoRWY|7d^^gU_xcfgP#TT_lA{68SDOHLdc=cmh7$XMV*lU2FrC?O;cg2EbPm$54=3%gc%zoDW(8s)IYd7THg zry*J>8ZCr7a1VnlN7;^E=i=p1PMusNn>9HA#9Z2mjMFh~f0Es_^_VT+2lk^xpeE%) zIQw)FrdFIa6r44(^R83(EF_mqyJu9`F5%ftkL-#0aQmY!p~w7n5(c7!5!#AvwYjZ_ zGU6e_>oQ!3AQBKT)~)pHN_BfE>t1s5!*^rY)OSbgK7=xcGbm$7R9$s=Kmn{2=-5y9 zggCb{YIk57n@^uH1|&=Qi2uG2!~{`~ps|kaYEQG2Y=-AwYQx-H7^F7ih$@LO#%uQP zhrpbDsx5?LGQ5!BJ;^^ThVstlPVvjd<^N@ga>&}8`f#CxuwLTaDeef8M<(3et61*| z+mRSy_KieY#Q|0MqNTL8K0v5c4Ajkvos$%*^uohCR+WT8`41b_0G#T-Im&VlV0{xO z@+ct(#QgsAQNIPO2^4c!FZW#U5Ql<#U~xMP7pgi z>KAs(8xv!@Cb4#Ll5wXkzK2!z2R+6qK3hqU;@Kj&;WrwvXhBY-ie(JN!ewRq{r84=; zu3PzQWKCiFP+F9V0fe-6Fp10-E;Z#0lPn7OW{49D@8PzHLuqCpmZrnk3@;`bVeMWF zno(W(78995CO168QU{-I6m3s}0n?lHE$eZS#Ul2$y%+MQCUY^ihDxu0Ep#m3+{@Ov zm~d^gvCYk{uP5B9>_xqf*g_XV6~lO7Z@qGgeIO^lay;EKE=qZqmapCqLWpJJDO)tz z^Rx5Zn58Rl)9ma_0Ah58;B{Hju2H0+8C|gd;ux-Ep5kWEY+~1?2?xX-yqqHD0~TJi za7%A(6TV8Ej<2dy3J#cFt#4u?YEy4v$Lk435dAfiCAV3|3tJwfmIGhWh5Ij_ZTafQ z*8+AFK=C{1SIAFJXxIM$F|K8~>D#u-*S+Pq#35a~<@IG{?>vsb6WQ^2vJo3mQ`5lK=t!pTK5jqru^eqR*jiW z6EN|w7jig*FroQ5n$zwk$e96oqm{hX-;CHc*;pp|XW#!qdKHSX3K_@64SikF4)KK0 z&{xDsKYIQ#$HnOj!iG_R2jhkDgcj*T5z8&d5o}UueKKVG*VQ^JxPGhj3aqzituSXA zNzD9;cTi^k-5m?|_#d8I^-Xp87-Y|h`i~+$GX*gYbI;Yh;`U(hI}l6T(Px$yn~F4k zU$d|hKqO$PZO1|Hj4(bH!1{F@?JtHmRg(0hnJw((!Ye}2ih6Z334AM2ae5XU{Qwop zoT&c^;QW6Am>N@oH;E;*f63YjJC2dVn^3<1!ewT=wVuYPd!UV5S9>qE_(0p33cgo# zh($dGF|{4}FBdljX&g*;5MzOg&Oi2$#EGtHdu5K-M=&=$RAK%zYy;9`q*ua}a5;D3X?WCDL4kMUY zlM2XUX|}bK1f1uoHgTp%L~5oAqFvr}Xpie7tSZiME&G2elVIUjEyQ?z< zx73XobD@hifKWjDRpF<%$@TpiK9K0;7`yNz+RDaHMKGHi=PqaRJj|4sHx=f0GMuj? zXBRY_bp|wyFa+qT_B{haKDf;sA~P}UXI$YQS%Bj2M7;R{*&GFw-|UjD=0ux0q+dkV zKUb2;n?5p6Z=?-Jsvx`!sGxH9tECgV9BNX#rhk`xz}ls+K<)TBLTCFamLig0(84vs zqu@XBDHT)^2mS1!RrVt7#TIM$ia&zncrVZ z3=1Y|qiE;IqQ&I)H1#SZ!6}TL9{DmMOY#zD3g{RZ4TFB`AYTU6`f_Y9{G+v?Lt< z2BFKZTkG^L=2=Dkk%)MvTHo0u7{g9*{v_V5DPm)_Jm69QAQwcy@h+}v>Sno3tz#l4 zN_tB8oNY%;?i*Q;mceY0(W(lts68El%FX#1nGR|c>Cj1a-;IT`RoX zuxvQ(EyU^xiRh&jGNgM!f{Zfq_~p`y?E&MVk>cS_+D+uWMPwMX0xzsp2(3B_A`NOg z3UvGE%s6F%Y9&QS$rbNzO2N`k4?|x>8F@RqCN><1r{y2jg`RFNDsI@bAZO~SM=TRa z&b$=_K+^&gghyrB5?3m9&VLMJAv)Wy!ecrfGLNqZ(BaqB{A#b7@Q5dcDG6I#iUcD! z@klk7J)-Sus$c6IjtFjwg7CyJ8VeLGDASfSKJ)^in~3|A4CK~D1OA0PY*y2P7 zfHr82zq|i)Bs3=glCleCx%o3TYu;l-??LM_Ni4Wzt25-;w$6@1FKx8z5ia|?bZQLn zhUY%+1o>qKS3?!_gGto?=Hn3%N9>enIs9WiQp2TTl#2o#W9%?8uu;rPvyR1G0hpO%7fg4k`Zzex&m4iN@CEI#V4H!t?_6HTdH{)beN>G{wt2K@3eTc_SaM=3h6@p^$3 z9UcRCj5q%0f|dx>c6=;s%$Uvkq2(YFFF>&S&z!5?NG~;W&k{~GUMzD>QoCPdIQk70#KTS9_K7#so z9DM?WeqJyUd?<7b( zTK&c_vgi%)JtFrrP=5dQnpcgmaW5A*fSOgn@qD^0 z&Du)Y`>sOUH(^+%bg*+>1GTP zpuA0=(q9TSONdhOT&MB7Tw6Lo=JdqNt=_*yuXE!t;c;{-ze69cg5t z=ZjvL64%ROF8xj)#7jw9>0uu!0^oa!t@xrCXJ-T9+lWZD6Di|DPbecwIX-B z&qNu=#aySnQAo4k?xks=PNUFbJZ@c8;Vh{G=&=(;00c3W9e|k0>}@y2)<_Qc08WnE zpq*iUw!NA-M~*Y!oRgLZaQ9`sW0n&08;>mGS)4gh5=;*9$|>eyPFfi5cizz80j>t=H?uwG^BZ(WSSj3?g`bu1N(tRH2(Q+qJ0MQbypa~ zGerBkGq;NKD~dJS_7TdkS(Q4cfxos_OKu{$H#jO&7owxt&h=T6x(aFi6X6ecu0Qi- zOjNHYHC!}p<=ECq$T2EBjT~qb^A?HselMaN;yf6SH6Hiq4-w`MO5%*m*jISwEGHUY3 z+ny*I#v2uCFkvCAicaIjfnJG*1QHK4IsT6bq?H~+L>AgUefDHTbM91mC;{Y@mHkS( zlhK>ymCh}mIDL*o+#T#ImU0EY{hxlf=`!muDbB5E^z7cgoD7`(<+=>oKjAnX(V$5| zV@F9O>LFI|6vuHm`MkjfzpboQSG@M|&@gJ4+>=9R+V7WZlI%nsjwfajm|0Cg0=h_pso^%mI8zV@j#o^E7rqwvvmjXiNTAOk?9nr2LYjYu$v2R>G!ztdTpw^ z{ZePM?z35X+M~#0@_qpCNMH=a0Mrixk}Sql4)I{H9%MC~=33^6-7?x+v8|ozNCAza ziH*rzLO;Ga4(S1jxpIR+s*!%TKA|0J+|#}A^hchzo}4v(&gh}f()0xk9D>!94RVw6 z&g-@%=_FD?qH*I}n&+4v2q4sf=@NJtGkeqj(qsRb|EcA&{BNSJBEZ2!#mt3JhvA?2 zOUR&V=HWufAZ2G{VJ1wd_a8E^gS`vkf6Bk&%!I7}T$TT$k(H3`zf3kl_Wv^32|50| z`5!VcgP4blgo?{QarnQxOQK-`5=k4Qlo4mp3;FoYYs;`eaH*
  • soRRg(4fNFaOUHNL^!mU2PjY+6DhGfn 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 UdT@3HIk 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 diff --git a/systemvm/agent/noVNC/docs/rfbproto-3.8.pdf b/systemvm/agent/noVNC/docs/rfbproto-3.8.pdf deleted file mode 100644 index 8f0730fb7f947147e53d2a3eadd453408ab0ff05..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 143840 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

    GwFe>b=0IJITgXgI_UKOkWb^@Z0S0GRXwSX7R& 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%0DXNY31vj)5}Qz|8@U=jss3>TK|jt|J2{p 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 diff --git a/systemvm/agent/noVNC/karma.conf.js b/systemvm/agent/noVNC/karma.conf.js deleted file mode 100644 index 5cbd7a5de86a..000000000000 --- a/systemvm/agent/noVNC/karma.conf.js +++ /dev/null @@ -1,134 +0,0 @@ -// Karma configuration - -module.exports = (config) => { - const customLaunchers = {}; - let browsers = []; - let useSauce = false; - - // use Sauce when running on Travis - if (process.env.TRAVIS_JOB_NUMBER) { - useSauce = true; - } - - if (useSauce && process.env.TEST_BROWSER_NAME && process.env.TEST_BROWSER_NAME != 'PhantomJS') { - const names = process.env.TEST_BROWSER_NAME.split(','); - const platforms = process.env.TEST_BROWSER_OS.split(','); - const versions = process.env.TEST_BROWSER_VERSION - ? process.env.TEST_BROWSER_VERSION.split(',') - : [null]; - - for (let i = 0; i < names.length; i++) { - for (let j = 0; j < platforms.length; j++) { - for (let k = 0; k < versions.length; k++) { - let launcher_name = 'sl_' + platforms[j].replace(/[^a-zA-Z0-9]/g, '') + '_' + names[i]; - if (versions[k]) { - launcher_name += '_' + versions[k]; - } - - customLaunchers[launcher_name] = { - base: 'SauceLabs', - browserName: names[i], - platform: platforms[j], - }; - - if (versions[i]) { - customLaunchers[launcher_name].version = versions[k]; - } - } - } - } - - browsers = Object.keys(customLaunchers); - } else { - useSauce = false; - //browsers = ['PhantomJS']; - browsers = []; - } - - const my_conf = { - - // base path that will be used to resolve all patterns (eg. files, exclude) - basePath: '', - - // frameworks to use - // available frameworks: https://npmjs.org/browse/keyword/karma-adapter - frameworks: ['mocha', 'sinon-chai'], - - // list of files / patterns to load in the browser (loaded in order) - files: [ - { pattern: 'app/localization.js', included: false }, - { pattern: 'app/webutil.js', included: false }, - { pattern: 'core/**/*.js', included: false }, - { pattern: 'vendor/pako/**/*.js', included: false }, - { pattern: 'vendor/browser-es-module-loader/dist/*.js*', included: false }, - { pattern: 'tests/test.*.js', included: false }, - { pattern: 'tests/fake.*.js', included: false }, - { pattern: 'tests/assertions.js', included: false }, - 'vendor/promise.js', - 'tests/karma-test-main.js', - ], - - client: { - mocha: { - // replace Karma debug page with mocha display - 'reporter': 'html', - 'ui': 'bdd' - } - }, - - // list of files to exclude - exclude: [ - ], - - customLaunchers: customLaunchers, - - // start these browsers - // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher - browsers: browsers, - - // test results reporter to use - // possible values: 'dots', 'progress' - // available reporters: https://npmjs.org/browse/keyword/karma-reporter - reporters: ['mocha'], - - - // web server port - port: 9876, - - - // enable / disable colors in the output (reporters and logs) - colors: true, - - - // level of logging - // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG - logLevel: config.LOG_INFO, - - - // enable / disable watching file and executing tests whenever any file changes - autoWatch: false, - - // Continuous Integration mode - // if true, Karma captures browsers, runs the tests and exits - singleRun: true, - - // Increase timeout in case connection is slow/we run more browsers than possible - // (we currently get 3 for free, and we try to run 7, so it can take a while) - captureTimeout: 240000, - - // similarly to above - browserNoActivityTimeout: 100000, - }; - - if (useSauce) { - my_conf.reporters.push('saucelabs'); - my_conf.captureTimeout = 0; // use SL timeout - my_conf.sauceLabs = { - testName: 'noVNC Tests (all)', - startConnect: false, - tunnelIdentifier: process.env.TRAVIS_JOB_NUMBER - }; - } - - config.set(my_conf); -}; diff --git a/systemvm/agent/noVNC/package.json b/systemvm/agent/noVNC/package.json index 2d84a5f38e5f..8fc04e50ae22 100644 --- a/systemvm/agent/noVNC/package.json +++ b/systemvm/agent/noVNC/package.json @@ -1,6 +1,6 @@ { "name": "@novnc/novnc", - "version": "1.1.0", + "version": "1.2.0", "description": "An HTML5 VNC client", "browser": "lib/rfb", "directories": { @@ -19,7 +19,7 @@ "vendor/pako" ], "scripts": { - "lint": "eslint app core po tests utils", + "lint": "eslint app core po/po2js po/xgettext-html tests utils", "test": "karma start karma.conf.js", "prepublish": "node ./utils/use_require.js --as commonjs --clean" }, @@ -40,36 +40,42 @@ }, "homepage": "https://github.com/novnc/noVNC", "devDependencies": { - "babel-core": "^6.22.1", - "babel-plugin-add-module-exports": "^0.2.1", + "@babel/core": "*", + "@babel/plugin-syntax-dynamic-import": "*", + "@babel/plugin-transform-modules-amd": "*", + "@babel/plugin-transform-modules-commonjs": "*", + "@babel/plugin-transform-modules-systemjs": "*", + "@babel/plugin-transform-modules-umd": "*", + "@babel/preset-env": "*", + "@babel/cli": "*", "babel-plugin-import-redirect": "*", - "babel-plugin-syntax-dynamic-import": "^6.18.0", - "babel-plugin-transform-es2015-modules-amd": "^6.22.0", - "babel-plugin-transform-es2015-modules-commonjs": "^6.18.0", - "babel-plugin-transform-es2015-modules-systemjs": "^6.22.0", - "babel-plugin-transform-es2015-modules-umd": "^6.22.0", - "babel-preset-es2015": "^6.24.1", - "babelify": "^7.3.0", - "browserify": "^13.1.0", - "chai": "^3.5.0", - "commander": "^2.9.0", - "es-module-loader": "^2.1.0", - "eslint": "^4.16.0", - "fs-extra": "^1.0.0", + "browserify": "*", + "babelify": "*", + "core-js": "*", + "chai": "*", + "commander": "*", + "es-module-loader": "*", + "eslint": "*", + "fs-extra": "*", "jsdom": "*", - "karma": "^1.3.0", - "karma-mocha": "^1.3.0", - "karma-mocha-reporter": "^2.2.0", - "karma-sauce-launcher": "^1.0.0", - "karma-sinon-chai": "^2.0.0", - "mocha": "^3.1.2", + "karma": "*", + "karma-mocha": "*", + "karma-chrome-launcher": "*", + "@chiragrupani/karma-chromium-edge-launcher": "*", + "karma-firefox-launcher": "*", + "karma-ie-launcher": "*", + "karma-mocha-reporter": "*", + "karma-safari-launcher": "*", + "karma-script-launcher": "*", + "karma-sinon-chai": "*", + "mocha": "*", "node-getopt": "*", "po2json": "*", - "requirejs": "^2.3.2", - "rollup": "^0.41.4", - "rollup-plugin-node-resolve": "^2.0.0", - "sinon": "^4.0.0", - "sinon-chai": "^2.8.0" + "requirejs": "*", + "rollup": "*", + "rollup-plugin-node-resolve": "*", + "sinon": "*", + "sinon-chai": "*" }, "dependencies": {}, "keywords": [ diff --git a/systemvm/agent/noVNC/po/Makefile b/systemvm/agent/noVNC/po/Makefile deleted file mode 100644 index 6dbd83043f7c..000000000000 --- a/systemvm/agent/noVNC/po/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -all: -.PHONY: update-po update-js update-pot - -LINGUAS := cs de el es ko nl pl ru sv tr zh_CN zh_TW - -VERSION := $(shell grep '"version"' ../package.json | cut -d '"' -f 4) - -POFILES := $(addsuffix .po,$(LINGUAS)) -JSONFILES := $(addprefix ../app/locale/,$(addsuffix .json,$(LINGUAS))) - -update-po: $(POFILES) -update-js: $(JSONFILES) - -%.po: noVNC.pot - msgmerge --update --lang=$* $@ $< -../app/locale/%.json: %.po - ./po2js $< $@ - -update-pot: - xgettext --output=noVNC.js.pot \ - --copyright-holder="The noVNC Authors" \ - --package-name="noVNC" \ - --package-version="$(VERSION)" \ - --msgid-bugs-address="novnc@googlegroups.com" \ - --add-comments=TRANSLATORS: \ - --from-code=UTF-8 \ - --sort-by-file \ - ../app/*.js \ - ../core/*.js \ - ../core/input/*.js - ./xgettext-html --output=noVNC.html.pot \ - ../vnc.html - msgcat --output-file=noVNC.pot \ - --sort-by-file noVNC.js.pot noVNC.html.pot - rm -f noVNC.js.pot noVNC.html.pot diff --git a/systemvm/agent/noVNC/po/cs.po b/systemvm/agent/noVNC/po/cs.po deleted file mode 100644 index 2b1efd8d9183..000000000000 --- a/systemvm/agent/noVNC/po/cs.po +++ /dev/null @@ -1,294 +0,0 @@ -# Czech translations for noVNC package. -# Copyright (C) 2018 The noVNC Authors -# This file is distributed under the same license as the noVNC package. -# Petr , 2018. -# -msgid "" -msgstr "" -"Project-Id-Version: noVNC 1.0.0-testing.2\n" -"Report-Msgid-Bugs-To: novnc@googlegroups.com\n" -"POT-Creation-Date: 2018-10-19 12:00+0200\n" -"PO-Revision-Date: 2018-10-19 12:00+0200\n" -"Last-Translator: Petr \n" -"Language-Team: Czech\n" -"Language: cs\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" - -#: ../app/ui.js:389 -msgid "Connecting..." -msgstr "Připojení..." - -#: ../app/ui.js:396 -msgid "Disconnecting..." -msgstr "Odpojení..." - -#: ../app/ui.js:402 -msgid "Reconnecting..." -msgstr "Obnova připojení..." - -#: ../app/ui.js:407 -msgid "Internal error" -msgstr "Vnitřní chyba" - -#: ../app/ui.js:997 -msgid "Must set host" -msgstr "Hostitel musí být nastavení" - -#: ../app/ui.js:1079 -msgid "Connected (encrypted) to " -msgstr "Připojení (šifrované) k " - -#: ../app/ui.js:1081 -msgid "Connected (unencrypted) to " -msgstr "Připojení (nešifrované) k " - -#: ../app/ui.js:1104 -msgid "Something went wrong, connection is closed" -msgstr "Něco se pokazilo, odpojeno" - -#: ../app/ui.js:1107 -msgid "Failed to connect to server" -msgstr "Chyba připojení k serveru" - -#: ../app/ui.js:1117 -msgid "Disconnected" -msgstr "Odpojeno" - -#: ../app/ui.js:1130 -msgid "New connection has been rejected with reason: " -msgstr "Nové připojení bylo odmítnuto s odůvodněním: " - -#: ../app/ui.js:1133 -msgid "New connection has been rejected" -msgstr "Nové připojení bylo odmítnuto" - -#: ../app/ui.js:1153 -msgid "Password is required" -msgstr "Je vyžadováno heslo" - -#: ../vnc.html:84 -msgid "noVNC encountered an error:" -msgstr "noVNC narazilo na chybu:" - -#: ../vnc.html:94 -msgid "Hide/Show the control bar" -msgstr "Skrýt/zobrazit ovládací panel" - -#: ../vnc.html:101 -msgid "Move/Drag Viewport" -msgstr "Přesunout/přetáhnout výřez" - -#: ../vnc.html:101 -msgid "viewport drag" -msgstr "přesun výřezu" - -#: ../vnc.html:107 ../vnc.html:110 ../vnc.html:113 ../vnc.html:116 -msgid "Active Mouse Button" -msgstr "Aktivní tlačítka myši" - -#: ../vnc.html:107 -msgid "No mousebutton" -msgstr "Žádné" - -#: ../vnc.html:110 -msgid "Left mousebutton" -msgstr "Levé tlačítko myši" - -#: ../vnc.html:113 -msgid "Middle mousebutton" -msgstr "Prostřední tlačítko myši" - -#: ../vnc.html:116 -msgid "Right mousebutton" -msgstr "Pravé tlačítko myši" - -#: ../vnc.html:119 -msgid "Keyboard" -msgstr "Klávesnice" - -#: ../vnc.html:119 -msgid "Show Keyboard" -msgstr "Zobrazit klávesnici" - -#: ../vnc.html:126 -msgid "Extra keys" -msgstr "Extra klávesy" - -#: ../vnc.html:126 -msgid "Show Extra Keys" -msgstr "Zobrazit extra klávesy" - -#: ../vnc.html:131 -msgid "Ctrl" -msgstr "Ctrl" - -#: ../vnc.html:131 -msgid "Toggle Ctrl" -msgstr "Přepnout Ctrl" - -#: ../vnc.html:134 -msgid "Alt" -msgstr "Alt" - -#: ../vnc.html:134 -msgid "Toggle Alt" -msgstr "Přepnout Alt" - -#: ../vnc.html:137 -msgid "Send Tab" -msgstr "Odeslat tabulátor" - -#: ../vnc.html:137 -msgid "Tab" -msgstr "Tab" - -#: ../vnc.html:140 -msgid "Esc" -msgstr "Esc" - -#: ../vnc.html:140 -msgid "Send Escape" -msgstr "Odeslat Esc" - -#: ../vnc.html:143 -msgid "Ctrl+Alt+Del" -msgstr "Ctrl+Alt+Del" - -#: ../vnc.html:143 -msgid "Send Ctrl-Alt-Del" -msgstr "Poslat Ctrl-Alt-Del" - -#: ../vnc.html:151 -msgid "Shutdown/Reboot" -msgstr "Vypnutí/Restart" - -#: ../vnc.html:151 -msgid "Shutdown/Reboot..." -msgstr "Vypnutí/Restart..." - -#: ../vnc.html:157 -msgid "Power" -msgstr "Napájení" - -#: ../vnc.html:159 -msgid "Shutdown" -msgstr "Vypnout" - -#: ../vnc.html:160 -msgid "Reboot" -msgstr "Restart" - -#: ../vnc.html:161 -msgid "Reset" -msgstr "Reset" - -#: ../vnc.html:166 ../vnc.html:172 -msgid "Clipboard" -msgstr "Schránka" - -#: ../vnc.html:176 -msgid "Clear" -msgstr "Vymazat" - -#: ../vnc.html:182 -msgid "Fullscreen" -msgstr "Celá obrazovka" - -#: ../vnc.html:187 ../vnc.html:194 -msgid "Settings" -msgstr "Nastavení" - -#: ../vnc.html:197 -msgid "Shared Mode" -msgstr "Sdílený režim" - -#: ../vnc.html:200 -msgid "View Only" -msgstr "Pouze prohlížení" - -#: ../vnc.html:204 -msgid "Clip to Window" -msgstr "Přizpůsobit oknu" - -#: ../vnc.html:207 -msgid "Scaling Mode:" -msgstr "Přizpůsobení velikosti" - -#: ../vnc.html:209 -msgid "None" -msgstr "Žádné" - -#: ../vnc.html:210 -msgid "Local Scaling" -msgstr "Místní" - -#: ../vnc.html:211 -msgid "Remote Resizing" -msgstr "Vzdálené" - -#: ../vnc.html:216 -msgid "Advanced" -msgstr "Pokročilé" - -#: ../vnc.html:219 -msgid "Repeater ID:" -msgstr "ID opakovače" - -#: ../vnc.html:223 -msgid "WebSocket" -msgstr "WebSocket" - -#: ../vnc.html:226 -msgid "Encrypt" -msgstr "Šifrování:" - -#: ../vnc.html:229 -msgid "Host:" -msgstr "Hostitel:" - -#: ../vnc.html:233 -msgid "Port:" -msgstr "Port:" - -#: ../vnc.html:237 -msgid "Path:" -msgstr "Cesta" - -#: ../vnc.html:244 -msgid "Automatic Reconnect" -msgstr "Automatická obnova připojení" - -#: ../vnc.html:247 -msgid "Reconnect Delay (ms):" -msgstr "Zpoždění připojení (ms)" - -#: ../vnc.html:252 -msgid "Show Dot when No Cursor" -msgstr "Tečka místo chybějícího kurzoru myši" - -#: ../vnc.html:257 -msgid "Logging:" -msgstr "Logování:" - -#: ../vnc.html:269 -msgid "Disconnect" -msgstr "Odpojit" - -#: ../vnc.html:288 -msgid "Connect" -msgstr "Připojit" - -#: ../vnc.html:298 -msgid "Password:" -msgstr "Heslo" - -#: ../vnc.html:302 -msgid "Send Password" -msgstr "Odeslat heslo" - -#: ../vnc.html:312 -msgid "Cancel" -msgstr "Zrušit" diff --git a/systemvm/agent/noVNC/po/de.po b/systemvm/agent/noVNC/po/de.po deleted file mode 100644 index 0c3fa0d482a1..000000000000 --- a/systemvm/agent/noVNC/po/de.po +++ /dev/null @@ -1,303 +0,0 @@ -# German translations for noVNC package -# German translation for noVNC. -# Copyright (C) 2018 The noVNC Authors -# This file is distributed under the same license as the noVNC package. -# Loek Janssen , 2016. -# -msgid "" -msgstr "" -"Project-Id-Version: noVNC 0.6.1\n" -"Report-Msgid-Bugs-To: novnc@googlegroups.com\n" -"POT-Creation-Date: 2017-11-24 07:16+0000\n" -"PO-Revision-Date: 2017-11-24 08:20+0100\n" -"Last-Translator: Dominik Csapak \n" -"Language-Team: none\n" -"Language: de\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.11\n" - -#: ../app/ui.js:404 -msgid "Connecting..." -msgstr "Verbinden..." - -#: ../app/ui.js:411 -msgid "Disconnecting..." -msgstr "Verbindung trennen..." - -#: ../app/ui.js:417 -msgid "Reconnecting..." -msgstr "Verbindung wiederherstellen..." - -#: ../app/ui.js:422 -msgid "Internal error" -msgstr "Interner Fehler" - -#: ../app/ui.js:1019 -msgid "Must set host" -msgstr "Richten Sie den Server ein" - -#: ../app/ui.js:1099 -msgid "Connected (encrypted) to " -msgstr "Verbunden mit (verschlüsselt) " - -#: ../app/ui.js:1101 -msgid "Connected (unencrypted) to " -msgstr "Verbunden mit (unverschlüsselt) " - -#: ../app/ui.js:1119 -msgid "Something went wrong, connection is closed" -msgstr "Etwas lief schief, Verbindung wurde getrennt" - -#: ../app/ui.js:1129 -msgid "Disconnected" -msgstr "Verbindung zum Server getrennt" - -#: ../app/ui.js:1142 -msgid "New connection has been rejected with reason: " -msgstr "Verbindung wurde aus folgendem Grund abgelehnt: " - -#: ../app/ui.js:1145 -msgid "New connection has been rejected" -msgstr "Verbindung wurde abgelehnt" - -#: ../app/ui.js:1166 -msgid "Password is required" -msgstr "Passwort ist erforderlich" - -#: ../vnc.html:89 -msgid "noVNC encountered an error:" -msgstr "Ein Fehler ist aufgetreten:" - -#: ../vnc.html:99 -msgid "Hide/Show the control bar" -msgstr "Kontrollleiste verstecken/anzeigen" - -#: ../vnc.html:106 -msgid "Move/Drag Viewport" -msgstr "Ansichtsfenster verschieben/ziehen" - -#: ../vnc.html:106 -msgid "viewport drag" -msgstr "Ansichtsfenster ziehen" - -#: ../vnc.html:112 ../vnc.html:115 ../vnc.html:118 ../vnc.html:121 -msgid "Active Mouse Button" -msgstr "Aktive Maustaste" - -#: ../vnc.html:112 -msgid "No mousebutton" -msgstr "Keine Maustaste" - -#: ../vnc.html:115 -msgid "Left mousebutton" -msgstr "Linke Maustaste" - -#: ../vnc.html:118 -msgid "Middle mousebutton" -msgstr "Mittlere Maustaste" - -#: ../vnc.html:121 -msgid "Right mousebutton" -msgstr "Rechte Maustaste" - -#: ../vnc.html:124 -msgid "Keyboard" -msgstr "Tastatur" - -#: ../vnc.html:124 -msgid "Show Keyboard" -msgstr "Tastatur anzeigen" - -#: ../vnc.html:131 -msgid "Extra keys" -msgstr "Zusatztasten" - -#: ../vnc.html:131 -msgid "Show Extra Keys" -msgstr "Zusatztasten anzeigen" - -#: ../vnc.html:136 -msgid "Ctrl" -msgstr "Strg" - -#: ../vnc.html:136 -msgid "Toggle Ctrl" -msgstr "Strg umschalten" - -#: ../vnc.html:139 -msgid "Alt" -msgstr "Alt" - -#: ../vnc.html:139 -msgid "Toggle Alt" -msgstr "Alt umschalten" - -#: ../vnc.html:142 -msgid "Send Tab" -msgstr "Tab senden" - -#: ../vnc.html:142 -msgid "Tab" -msgstr "Tab" - -#: ../vnc.html:145 -msgid "Esc" -msgstr "Esc" - -#: ../vnc.html:145 -msgid "Send Escape" -msgstr "Escape senden" - -#: ../vnc.html:148 -msgid "Ctrl+Alt+Del" -msgstr "Strg+Alt+Entf" - -#: ../vnc.html:148 -msgid "Send Ctrl-Alt-Del" -msgstr "Strg+Alt+Entf senden" - -#: ../vnc.html:156 -msgid "Shutdown/Reboot" -msgstr "Herunterfahren/Neustarten" - -#: ../vnc.html:156 -msgid "Shutdown/Reboot..." -msgstr "Herunterfahren/Neustarten..." - -#: ../vnc.html:162 -msgid "Power" -msgstr "Energie" - -#: ../vnc.html:164 -msgid "Shutdown" -msgstr "Herunterfahren" - -#: ../vnc.html:165 -msgid "Reboot" -msgstr "Neustarten" - -#: ../vnc.html:166 -msgid "Reset" -msgstr "Zurücksetzen" - -#: ../vnc.html:171 ../vnc.html:177 -msgid "Clipboard" -msgstr "Zwischenablage" - -#: ../vnc.html:181 -msgid "Clear" -msgstr "Löschen" - -#: ../vnc.html:187 -msgid "Fullscreen" -msgstr "Vollbild" - -#: ../vnc.html:192 ../vnc.html:199 -msgid "Settings" -msgstr "Einstellungen" - -#: ../vnc.html:202 -msgid "Shared Mode" -msgstr "Geteilter Modus" - -#: ../vnc.html:205 -msgid "View Only" -msgstr "Nur betrachten" - -#: ../vnc.html:209 -msgid "Clip to Window" -msgstr "Auf Fenster begrenzen" - -#: ../vnc.html:212 -msgid "Scaling Mode:" -msgstr "Skalierungsmodus:" - -#: ../vnc.html:214 -msgid "None" -msgstr "Keiner" - -#: ../vnc.html:215 -msgid "Local Scaling" -msgstr "Lokales skalieren" - -#: ../vnc.html:216 -msgid "Remote Resizing" -msgstr "Serverseitiges skalieren" - -#: ../vnc.html:221 -msgid "Advanced" -msgstr "Erweitert" - -#: ../vnc.html:224 -msgid "Repeater ID:" -msgstr "Repeater ID:" - -#: ../vnc.html:228 -msgid "WebSocket" -msgstr "WebSocket" - -#: ../vnc.html:231 -msgid "Encrypt" -msgstr "Verschlüsselt" - -#: ../vnc.html:234 -msgid "Host:" -msgstr "Server:" - -#: ../vnc.html:238 -msgid "Port:" -msgstr "Port:" - -#: ../vnc.html:242 -msgid "Path:" -msgstr "Pfad:" - -#: ../vnc.html:249 -msgid "Automatic Reconnect" -msgstr "Automatisch wiederverbinden" - -#: ../vnc.html:252 -msgid "Reconnect Delay (ms):" -msgstr "Wiederverbindungsverzögerung (ms):" - -#: ../vnc.html:258 -msgid "Logging:" -msgstr "Protokollierung:" - -#: ../vnc.html:270 -msgid "Disconnect" -msgstr "Verbindung trennen" - -#: ../vnc.html:289 -msgid "Connect" -msgstr "Verbinden" - -#: ../vnc.html:299 -msgid "Password:" -msgstr "Passwort:" - -#: ../vnc.html:313 -msgid "Cancel" -msgstr "Abbrechen" - -#: ../vnc.html:329 -msgid "Canvas not supported." -msgstr "Canvas nicht unterstützt." - -#~ msgid "Disconnect timeout" -#~ msgstr "Zeitüberschreitung beim Trennen" - -#~ msgid "Local Downscaling" -#~ msgstr "Lokales herunterskalieren" - -#~ msgid "Local Cursor" -#~ msgstr "Lokaler Mauszeiger" - -#~ msgid "Forcing clipping mode since scrollbars aren't supported by IE in fullscreen" -#~ msgstr "'Clipping-Modus' aktiviert, Scrollbalken in 'IE-Vollbildmodus' werden nicht unterstützt" - -#~ msgid "True Color" -#~ msgstr "True Color" diff --git a/systemvm/agent/noVNC/po/el.po b/systemvm/agent/noVNC/po/el.po deleted file mode 100644 index 5213ae5423ab..000000000000 --- a/systemvm/agent/noVNC/po/el.po +++ /dev/null @@ -1,323 +0,0 @@ -# Greek translations for noVNC package. -# Copyright (C) 2018 The noVNC Authors -# This file is distributed under the same license as the noVNC package. -# Giannis Kosmas , 2016. -# -msgid "" -msgstr "" -"Project-Id-Version: noVNC 0.6.1\n" -"Report-Msgid-Bugs-To: novnc@googlegroups.com\n" -"POT-Creation-Date: 2017-11-17 21:40+0200\n" -"PO-Revision-Date: 2017-10-11 16:16+0200\n" -"Last-Translator: Giannis Kosmas \n" -"Language-Team: none\n" -"Language: el\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../app/ui.js:404 -msgid "Connecting..." -msgstr "Συνδέεται..." - -#: ../app/ui.js:411 -msgid "Disconnecting..." -msgstr "Aποσυνδέεται..." - -#: ../app/ui.js:417 -msgid "Reconnecting..." -msgstr "Επανασυνδέεται..." - -#: ../app/ui.js:422 -msgid "Internal error" -msgstr "Εσωτερικό σφάλμα" - -#: ../app/ui.js:1019 -msgid "Must set host" -msgstr "Πρέπει να οριστεί ο διακομιστής" - -#: ../app/ui.js:1099 -msgid "Connected (encrypted) to " -msgstr "Συνδέθηκε (κρυπτογραφημένα) με το " - -#: ../app/ui.js:1101 -msgid "Connected (unencrypted) to " -msgstr "Συνδέθηκε (μη κρυπτογραφημένα) με το " - -#: ../app/ui.js:1119 -msgid "Something went wrong, connection is closed" -msgstr "Κάτι πήγε στραβά, η σύνδεση διακόπηκε" - -#: ../app/ui.js:1129 -msgid "Disconnected" -msgstr "Αποσυνδέθηκε" - -#: ../app/ui.js:1142 -msgid "New connection has been rejected with reason: " -msgstr "Η νέα σύνδεση απορρίφθηκε διότι: " - -#: ../app/ui.js:1145 -msgid "New connection has been rejected" -msgstr "Η νέα σύνδεση απορρίφθηκε " - -#: ../app/ui.js:1166 -msgid "Password is required" -msgstr "Απαιτείται ο κωδικός πρόσβασης" - -#: ../vnc.html:89 -msgid "noVNC encountered an error:" -msgstr "το noVNC αντιμετώπισε ένα σφάλμα:" - -#: ../vnc.html:99 -msgid "Hide/Show the control bar" -msgstr "Απόκρυψη/Εμφάνιση γραμμής ελέγχου" - -#: ../vnc.html:106 -msgid "Move/Drag Viewport" -msgstr "Μετακίνηση/Σύρσιμο Θεατού πεδίου" - -#: ../vnc.html:106 -msgid "viewport drag" -msgstr "σύρσιμο θεατού πεδίου" - -#: ../vnc.html:112 ../vnc.html:115 ../vnc.html:118 ../vnc.html:121 -msgid "Active Mouse Button" -msgstr "Ενεργό Πλήκτρο Ποντικιού" - -#: ../vnc.html:112 -msgid "No mousebutton" -msgstr "Χωρίς Πλήκτρο Ποντικιού" - -#: ../vnc.html:115 -msgid "Left mousebutton" -msgstr "Αριστερό Πλήκτρο Ποντικιού" - -#: ../vnc.html:118 -msgid "Middle mousebutton" -msgstr "Μεσαίο Πλήκτρο Ποντικιού" - -#: ../vnc.html:121 -msgid "Right mousebutton" -msgstr "Δεξί Πλήκτρο Ποντικιού" - -#: ../vnc.html:124 -msgid "Keyboard" -msgstr "Πληκτρολόγιο" - -#: ../vnc.html:124 -msgid "Show Keyboard" -msgstr "Εμφάνιση Πληκτρολογίου" - -#: ../vnc.html:131 -msgid "Extra keys" -msgstr "Επιπλέον πλήκτρα" - -#: ../vnc.html:131 -msgid "Show Extra Keys" -msgstr "Εμφάνιση Επιπλέον Πλήκτρων" - -#: ../vnc.html:136 -msgid "Ctrl" -msgstr "Ctrl" - -#: ../vnc.html:136 -msgid "Toggle Ctrl" -msgstr "Εναλλαγή Ctrl" - -#: ../vnc.html:139 -msgid "Alt" -msgstr "Alt" - -#: ../vnc.html:139 -msgid "Toggle Alt" -msgstr "Εναλλαγή Alt" - -#: ../vnc.html:142 -msgid "Send Tab" -msgstr "Αποστολή Tab" - -#: ../vnc.html:142 -msgid "Tab" -msgstr "Tab" - -#: ../vnc.html:145 -msgid "Esc" -msgstr "Esc" - -#: ../vnc.html:145 -msgid "Send Escape" -msgstr "Αποστολή Escape" - -#: ../vnc.html:148 -msgid "Ctrl+Alt+Del" -msgstr "Ctrl+Alt+Del" - -#: ../vnc.html:148 -msgid "Send Ctrl-Alt-Del" -msgstr "Αποστολή Ctrl-Alt-Del" - -#: ../vnc.html:156 -msgid "Shutdown/Reboot" -msgstr "Κλείσιμο/Επανεκκίνηση" - -#: ../vnc.html:156 -msgid "Shutdown/Reboot..." -msgstr "Κλείσιμο/Επανεκκίνηση..." - -#: ../vnc.html:162 -msgid "Power" -msgstr "Απενεργοποίηση" - -#: ../vnc.html:164 -msgid "Shutdown" -msgstr "Κλείσιμο" - -#: ../vnc.html:165 -msgid "Reboot" -msgstr "Επανεκκίνηση" - -#: ../vnc.html:166 -msgid "Reset" -msgstr "Επαναφορά" - -#: ../vnc.html:171 ../vnc.html:177 -msgid "Clipboard" -msgstr "Πρόχειρο" - -#: ../vnc.html:181 -msgid "Clear" -msgstr "Καθάρισμα" - -#: ../vnc.html:187 -msgid "Fullscreen" -msgstr "Πλήρης Οθόνη" - -#: ../vnc.html:192 ../vnc.html:199 -msgid "Settings" -msgstr "Ρυθμίσεις" - -#: ../vnc.html:202 -msgid "Shared Mode" -msgstr "Κοινόχρηστη Λειτουργία" - -#: ../vnc.html:205 -msgid "View Only" -msgstr "Μόνο Θέαση" - -#: ../vnc.html:209 -msgid "Clip to Window" -msgstr "Αποκοπή στο όριο του Παράθυρου" - -#: ../vnc.html:212 -msgid "Scaling Mode:" -msgstr "Λειτουργία Κλιμάκωσης:" - -#: ../vnc.html:214 -msgid "None" -msgstr "Καμία" - -#: ../vnc.html:215 -msgid "Local Scaling" -msgstr "Τοπική Κλιμάκωση" - -#: ../vnc.html:216 -msgid "Remote Resizing" -msgstr "Απομακρυσμένη Αλλαγή μεγέθους" - -#: ../vnc.html:221 -msgid "Advanced" -msgstr "Για προχωρημένους" - -#: ../vnc.html:224 -msgid "Repeater ID:" -msgstr "Repeater ID:" - -#: ../vnc.html:228 -msgid "WebSocket" -msgstr "WebSocket" - -#: ../vnc.html:231 -msgid "Encrypt" -msgstr "Κρυπτογράφηση" - -#: ../vnc.html:234 -msgid "Host:" -msgstr "Όνομα διακομιστή:" - -#: ../vnc.html:238 -msgid "Port:" -msgstr "Πόρτα διακομιστή:" - -#: ../vnc.html:242 -msgid "Path:" -msgstr "Διαδρομή:" - -#: ../vnc.html:249 -msgid "Automatic Reconnect" -msgstr "Αυτόματη επανασύνδεση" - -#: ../vnc.html:252 -msgid "Reconnect Delay (ms):" -msgstr "Καθυστέρηση επανασύνδεσης (ms):" - -#: ../vnc.html:258 -msgid "Logging:" -msgstr "Καταγραφή:" - -#: ../vnc.html:270 -msgid "Disconnect" -msgstr "Αποσύνδεση" - -#: ../vnc.html:289 -msgid "Connect" -msgstr "Σύνδεση" - -#: ../vnc.html:299 -msgid "Password:" -msgstr "Κωδικός Πρόσβασης:" - -#: ../vnc.html:313 -msgid "Cancel" -msgstr "Ακύρωση" - -#: ../vnc.html:329 -msgid "Canvas not supported." -msgstr "Δεν υποστηρίζεται το στοιχείο Canvas" - -#~ msgid "Disconnect timeout" -#~ msgstr "Παρέλευση χρονικού ορίου αποσύνδεσης" - -#~ msgid "Local Downscaling" -#~ msgstr "Τοπική Συρρίκνωση" - -#~ msgid "Local Cursor" -#~ msgstr "Τοπικός Δρομέας" - -#~ msgid "" -#~ "Forcing clipping mode since scrollbars aren't supported by IE in " -#~ "fullscreen" -#~ msgstr "" -#~ "Εφαρμογή λειτουργίας αποκοπής αφού δεν υποστηρίζονται οι λωρίδες κύλισης " -#~ "σε πλήρη οθόνη στον IE" - -#~ msgid "True Color" -#~ msgstr "Πραγματικά Χρώματα" - -#~ msgid "Style:" -#~ msgstr "Στυλ:" - -#~ msgid "default" -#~ msgstr "προεπιλεγμένο" - -#~ msgid "Apply" -#~ msgstr "Εφαρμογή" - -#~ msgid "Connection" -#~ msgstr "Σύνδεση" - -#~ msgid "Token:" -#~ msgstr "Διακριτικό:" - -#~ msgid "Send Password" -#~ msgstr "Αποστολή Κωδικού Πρόσβασης" diff --git a/systemvm/agent/noVNC/po/es.po b/systemvm/agent/noVNC/po/es.po deleted file mode 100644 index e15655fbfc9e..000000000000 --- a/systemvm/agent/noVNC/po/es.po +++ /dev/null @@ -1,283 +0,0 @@ -# Spanish translations for noVNC package -# Traducciones al español para el paquete noVNC. -# Copyright (C) 2018 The noVNC Authors -# This file is distributed under the same license as the noVNC package. -# Juanjo Diaz , 2018. -# -msgid "" -msgstr "" -"Project-Id-Version: noVNC 1.0.0-testing.2\n" -"Report-Msgid-Bugs-To: novnc@googlegroups.com\n" -"POT-Creation-Date: 2017-10-06 10:07+0200\n" -"PO-Revision-Date: 2018-01-30 19:14-0800\n" -"Last-Translator: Juanjo Diaz \n" -"Language-Team: Spanish\n" -"Language: es\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../app/ui.js:430 -msgid "Connecting..." -msgstr "Conectando..." - -#: ../app/ui.js:438 -msgid "Connected (encrypted) to " -msgstr "Conectado (con encriptación) a" - -#: ../app/ui.js:440 -msgid "Connected (unencrypted) to " -msgstr "Conectado (sin encriptación) a" - -#: ../app/ui.js:446 -msgid "Disconnecting..." -msgstr "Desconectando..." - -#: ../app/ui.js:450 -msgid "Disconnected" -msgstr "Desconectado" - -#: ../app/ui.js:1052 ../core/rfb.js:248 -msgid "Must set host" -msgstr "Debes configurar el host" - -#: ../app/ui.js:1101 -msgid "Reconnecting..." -msgstr "Reconectando..." - -#: ../app/ui.js:1140 -msgid "Password is required" -msgstr "Contraseña es obligatoria" - -#: ../core/rfb.js:548 -msgid "Disconnect timeout" -msgstr "Tiempo de desconexión agotado" - -#: ../vnc.html:89 -msgid "noVNC encountered an error:" -msgstr "noVNC ha encontrado un error:" - -#: ../vnc.html:99 -msgid "Hide/Show the control bar" -msgstr "Ocultar/Mostrar la barra de control" - -#: ../vnc.html:106 -msgid "Move/Drag Viewport" -msgstr "Mover/Arrastrar la ventana" - -#: ../vnc.html:106 -msgid "viewport drag" -msgstr "Arrastrar la ventana" - -#: ../vnc.html:112 ../vnc.html:115 ../vnc.html:118 ../vnc.html:121 -msgid "Active Mouse Button" -msgstr "Botón activo del ratón" - -#: ../vnc.html:112 -msgid "No mousebutton" -msgstr "Ningún botón del ratón" - -#: ../vnc.html:115 -msgid "Left mousebutton" -msgstr "Botón izquierdo del ratón" - -#: ../vnc.html:118 -msgid "Middle mousebutton" -msgstr "Botón central del ratón" - -#: ../vnc.html:121 -msgid "Right mousebutton" -msgstr "Botón derecho del ratón" - -#: ../vnc.html:124 -msgid "Keyboard" -msgstr "Teclado" - -#: ../vnc.html:124 -msgid "Show Keyboard" -msgstr "Mostrar teclado" - -#: ../vnc.html:131 -msgid "Extra keys" -msgstr "Teclas adicionales" - -#: ../vnc.html:131 -msgid "Show Extra Keys" -msgstr "Mostrar Teclas Adicionales" - -#: ../vnc.html:136 -msgid "Ctrl" -msgstr "Ctrl" - -#: ../vnc.html:136 -msgid "Toggle Ctrl" -msgstr "Pulsar/Soltar Ctrl" - -#: ../vnc.html:139 -msgid "Alt" -msgstr "Alt" - -#: ../vnc.html:139 -msgid "Toggle Alt" -msgstr "Pulsar/Soltar Alt" - -#: ../vnc.html:142 -msgid "Send Tab" -msgstr "Enviar Tabulación" - -#: ../vnc.html:142 -msgid "Tab" -msgstr "Tabulación" - -#: ../vnc.html:145 -msgid "Esc" -msgstr "Esc" - -#: ../vnc.html:145 -msgid "Send Escape" -msgstr "Enviar Escape" - -#: ../vnc.html:148 -msgid "Ctrl+Alt+Del" -msgstr "Ctrl+Alt+Del" - -#: ../vnc.html:148 -msgid "Send Ctrl-Alt-Del" -msgstr "Enviar Ctrl+Alt+Del" - -#: ../vnc.html:156 -msgid "Shutdown/Reboot" -msgstr "Apagar/Reiniciar" - -#: ../vnc.html:156 -msgid "Shutdown/Reboot..." -msgstr "Apagar/Reiniciar..." - -#: ../vnc.html:162 -msgid "Power" -msgstr "Encender" - -#: ../vnc.html:164 -msgid "Shutdown" -msgstr "Apagar" - -#: ../vnc.html:165 -msgid "Reboot" -msgstr "Reiniciar" - -#: ../vnc.html:166 -msgid "Reset" -msgstr "Restablecer" - -#: ../vnc.html:171 ../vnc.html:177 -msgid "Clipboard" -msgstr "Portapapeles" - -#: ../vnc.html:181 -msgid "Clear" -msgstr "Vaciar" - -#: ../vnc.html:187 -msgid "Fullscreen" -msgstr "Pantalla Completa" - -#: ../vnc.html:192 ../vnc.html:199 -msgid "Settings" -msgstr "Configuraciones" - -#: ../vnc.html:202 -msgid "Shared Mode" -msgstr "Modo Compartido" - -#: ../vnc.html:205 -msgid "View Only" -msgstr "Solo visualización" - -#: ../vnc.html:209 -msgid "Clip to Window" -msgstr "Recortar al tamaño de la ventana" - -#: ../vnc.html:212 -msgid "Scaling Mode:" -msgstr "Modo de escalado:" - -#: ../vnc.html:214 -msgid "None" -msgstr "Ninguno" - -#: ../vnc.html:215 -msgid "Local Scaling" -msgstr "Escalado Local" - -#: ../vnc.html:216 -msgid "Local Downscaling" -msgstr "Reducción de escala local" - -#: ../vnc.html:217 -msgid "Remote Resizing" -msgstr "Cambio de tamaño remoto" - -#: ../vnc.html:222 -msgid "Advanced" -msgstr "Avanzado" - -#: ../vnc.html:225 -msgid "Local Cursor" -msgstr "Cursor Local" - -#: ../vnc.html:229 -msgid "Repeater ID:" -msgstr "ID del Repetidor" - -#: ../vnc.html:233 -msgid "WebSocket" -msgstr "WebSocket" - -#: ../vnc.html:236 -msgid "Encrypt" -msgstr "" - -#: ../vnc.html:239 -msgid "Host:" -msgstr "Host" - -#: ../vnc.html:243 -msgid "Port:" -msgstr "Puesto" - -#: ../vnc.html:247 -msgid "Path:" -msgstr "Ruta" - -#: ../vnc.html:254 -msgid "Automatic Reconnect" -msgstr "Reconexión automática" - -#: ../vnc.html:257 -msgid "Reconnect Delay (ms):" -msgstr "Retraso en la reconexión (ms)" - -#: ../vnc.html:263 -msgid "Logging:" -msgstr "Logging" - -#: ../vnc.html:275 -msgid "Disconnect" -msgstr "Desconectar" - -#: ../vnc.html:294 -msgid "Connect" -msgstr "Conectar" - -#: ../vnc.html:304 -msgid "Password:" -msgstr "Contraseña" - -#: ../vnc.html:318 -msgid "Cancel" -msgstr "Cancelar" - -#: ../vnc.html:334 -msgid "Canvas not supported." -msgstr "Canvas no está soportado" diff --git a/systemvm/agent/noVNC/po/ko.po b/systemvm/agent/noVNC/po/ko.po deleted file mode 100644 index 87ae1069741d..000000000000 --- a/systemvm/agent/noVNC/po/ko.po +++ /dev/null @@ -1,290 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) 2018 The noVNC Authors -# This file is distributed under the same license as the noVNC package. -# Baw Appie , 2018. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: noVNC 1.0.0-testing.2\n" -"Report-Msgid-Bugs-To: novnc@googlegroups.com\n" -"POT-Creation-Date: 2018-01-31 16:29+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Baw Appie \n" -"Language-Team: Korean\n" -"Language: ko\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../app/ui.js:395 -msgid "Connecting..." -msgstr "연결중..." - -#: ../app/ui.js:402 -msgid "Disconnecting..." -msgstr "연결 해제중..." - -#: ../app/ui.js:408 -msgid "Reconnecting..." -msgstr "재연결중..." - -#: ../app/ui.js:413 -msgid "Internal error" -msgstr "내부 오류" - -#: ../app/ui.js:1002 -msgid "Must set host" -msgstr "호스트는 설정되어야 합니다." - -#: ../app/ui.js:1083 -msgid "Connected (encrypted) to " -msgstr "다음과 (암호화되어) 연결되었습니다:" - -#: ../app/ui.js:1085 -msgid "Connected (unencrypted) to " -msgstr "다음과 (암호화 없이) 연결되었습니다:" - -#: ../app/ui.js:1108 -msgid "Something went wrong, connection is closed" -msgstr "무언가 잘못되었습니다, 연결이 닫혔습니다." - -#: ../app/ui.js:1111 -msgid "Failed to connect to server" -msgstr "서버에 연결하지 못했습니다." - -#: ../app/ui.js:1121 -msgid "Disconnected" -msgstr "연결이 해제되었습니다." - -#: ../app/ui.js:1134 -msgid "New connection has been rejected with reason: " -msgstr "새 연결이 다음 이유로 거부되었습니다:" - -#: ../app/ui.js:1137 -msgid "New connection has been rejected" -msgstr "새 연결이 거부되었습니다." - -#: ../app/ui.js:1158 -msgid "Password is required" -msgstr "비밀번호가 필요합니다." - -#: ../vnc.html:91 -msgid "noVNC encountered an error:" -msgstr "noVNC에 오류가 발생했습니다:" - -#: ../vnc.html:101 -msgid "Hide/Show the control bar" -msgstr "컨트롤 바 숨기기/보이기" - -#: ../vnc.html:108 -msgid "Move/Drag Viewport" -msgstr "움직이기/드래그 뷰포트" - -#: ../vnc.html:108 -msgid "viewport drag" -msgstr "뷰포트 드래그" - -#: ../vnc.html:114 ../vnc.html:117 ../vnc.html:120 ../vnc.html:123 -msgid "Active Mouse Button" -msgstr "마우스 버튼 활성화" - -#: ../vnc.html:114 -msgid "No mousebutton" -msgstr "마우스 버튼 없음" - -#: ../vnc.html:117 -msgid "Left mousebutton" -msgstr "왼쪽 마우스 버튼" - -#: ../vnc.html:120 -msgid "Middle mousebutton" -msgstr "중간 마우스 버튼" - -#: ../vnc.html:123 -msgid "Right mousebutton" -msgstr "오른쪽 마우스 버튼" - -#: ../vnc.html:126 -msgid "Keyboard" -msgstr "키보드" - -#: ../vnc.html:126 -msgid "Show Keyboard" -msgstr "키보드 보이기" - -#: ../vnc.html:133 -msgid "Extra keys" -msgstr "기타 키들" - -#: ../vnc.html:133 -msgid "Show Extra Keys" -msgstr "기타 키들 보이기" - -#: ../vnc.html:138 -msgid "Ctrl" -msgstr "Ctrl" - -#: ../vnc.html:138 -msgid "Toggle Ctrl" -msgstr "Ctrl 켜기/끄기" - -#: ../vnc.html:141 -msgid "Alt" -msgstr "Alt" - -#: ../vnc.html:141 -msgid "Toggle Alt" -msgstr "Alt 켜기/끄기" - -#: ../vnc.html:144 -msgid "Send Tab" -msgstr "Tab 보내기" - -#: ../vnc.html:144 -msgid "Tab" -msgstr "Tab" - -#: ../vnc.html:147 -msgid "Esc" -msgstr "Esc" - -#: ../vnc.html:147 -msgid "Send Escape" -msgstr "Esc 보내기" - -#: ../vnc.html:150 -msgid "Ctrl+Alt+Del" -msgstr "Ctrl+Alt+Del" - -#: ../vnc.html:150 -msgid "Send Ctrl-Alt-Del" -msgstr "Ctrl+Alt+Del 보내기" - -#: ../vnc.html:158 -msgid "Shutdown/Reboot" -msgstr "셧다운/리붓" - -#: ../vnc.html:158 -msgid "Shutdown/Reboot..." -msgstr "셧다운/리붓..." - -#: ../vnc.html:164 -msgid "Power" -msgstr "전원" - -#: ../vnc.html:166 -msgid "Shutdown" -msgstr "셧다운" - -#: ../vnc.html:167 -msgid "Reboot" -msgstr "리붓" - -#: ../vnc.html:168 -msgid "Reset" -msgstr "리셋" - -#: ../vnc.html:173 ../vnc.html:179 -msgid "Clipboard" -msgstr "클립보드" - -#: ../vnc.html:183 -msgid "Clear" -msgstr "지우기" - -#: ../vnc.html:189 -msgid "Fullscreen" -msgstr "전체화면" - -#: ../vnc.html:194 ../vnc.html:201 -msgid "Settings" -msgstr "설정" - -#: ../vnc.html:204 -msgid "Shared Mode" -msgstr "공유 모드" - -#: ../vnc.html:207 -msgid "View Only" -msgstr "보기 전용" - -#: ../vnc.html:211 -msgid "Clip to Window" -msgstr "창에 클립" - -#: ../vnc.html:214 -msgid "Scaling Mode:" -msgstr "스케일링 모드:" - -#: ../vnc.html:216 -msgid "None" -msgstr "없음" - -#: ../vnc.html:217 -msgid "Local Scaling" -msgstr "로컬 스케일링" - -#: ../vnc.html:218 -msgid "Remote Resizing" -msgstr "원격 크기 조절" - -#: ../vnc.html:223 -msgid "Advanced" -msgstr "고급" - -#: ../vnc.html:226 -msgid "Repeater ID:" -msgstr "중계 ID" - -#: ../vnc.html:230 -msgid "WebSocket" -msgstr "웹소켓" - -#: ../vnc.html:233 -msgid "Encrypt" -msgstr "암호화" - -#: ../vnc.html:236 -msgid "Host:" -msgstr "호스트:" - -#: ../vnc.html:240 -msgid "Port:" -msgstr "포트:" - -#: ../vnc.html:244 -msgid "Path:" -msgstr "위치:" - -#: ../vnc.html:251 -msgid "Automatic Reconnect" -msgstr "자동 재연결" - -#: ../vnc.html:254 -msgid "Reconnect Delay (ms):" -msgstr "재연결 지연 시간 (ms)" - -#: ../vnc.html:260 -msgid "Logging:" -msgstr "로깅" - -#: ../vnc.html:272 -msgid "Disconnect" -msgstr "연결 해제" - -#: ../vnc.html:291 -msgid "Connect" -msgstr "연결" - -#: ../vnc.html:301 -msgid "Password:" -msgstr "비밀번호:" - -#: ../vnc.html:305 -msgid "Send Password" -msgstr "비밀번호 전송" - -#: ../vnc.html:315 -msgid "Cancel" -msgstr "취소" diff --git a/systemvm/agent/noVNC/po/nl.po b/systemvm/agent/noVNC/po/nl.po deleted file mode 100644 index 343204a9fd2c..000000000000 --- a/systemvm/agent/noVNC/po/nl.po +++ /dev/null @@ -1,322 +0,0 @@ -# Dutch translations for noVNC package -# Nederlandse vertalingen voor het pakket noVNC. -# Copyright (C) 2018 The noVNC Authors -# This file is distributed under the same license as the noVNC package. -# Loek Janssen , 2016. -# -msgid "" -msgstr "" -"Project-Id-Version: noVNC 1.1.0\n" -"Report-Msgid-Bugs-To: novnc@googlegroups.com\n" -"POT-Creation-Date: 2019-04-09 11:06+0100\n" -"PO-Revision-Date: 2019-04-09 17:17+0100\n" -"Last-Translator: Arend Lapere \n" -"Language-Team: none\n" -"Language: nl\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" - -#: ../app/ui.js:383 -msgid "Connecting..." -msgstr "Verbinden..." - -#: ../app/ui.js:390 -msgid "Disconnecting..." -msgstr "Verbinding verbreken..." - -#: ../app/ui.js:396 -msgid "Reconnecting..." -msgstr "Opnieuw verbinding maken..." - -#: ../app/ui.js:401 -msgid "Internal error" -msgstr "Interne fout" - -#: ../app/ui.js:991 -msgid "Must set host" -msgstr "Host moeten worden ingesteld" - -#: ../app/ui.js:1073 -msgid "Connected (encrypted) to " -msgstr "Verbonden (versleuteld) met " - -#: ../app/ui.js:1075 -msgid "Connected (unencrypted) to " -msgstr "Verbonden (onversleuteld) met " - -#: ../app/ui.js:1098 -msgid "Something went wrong, connection is closed" -msgstr "Er iets fout gelopen, verbinding werd verbroken" - -#: ../app/ui.js:1101 -msgid "Failed to connect to server" -msgstr "Verbinding maken met server is mislukt" - -#: ../app/ui.js:1111 -msgid "Disconnected" -msgstr "Verbinding verbroken" - -#: ../app/ui.js:1124 -msgid "New connection has been rejected with reason: " -msgstr "Nieuwe verbinding is geweigerd omwille van de volgende reden: " - -#: ../app/ui.js:1127 -msgid "New connection has been rejected" -msgstr "Nieuwe verbinding is geweigerd" - -#: ../app/ui.js:1147 -msgid "Password is required" -msgstr "Wachtwoord is vereist" - -#: ../vnc.html:80 -msgid "noVNC encountered an error:" -msgstr "noVNC heeft een fout bemerkt:" - -#: ../vnc.html:90 -msgid "Hide/Show the control bar" -msgstr "Verberg/Toon de bedieningsbalk" - -#: ../vnc.html:97 -msgid "Move/Drag Viewport" -msgstr "Verplaats/Versleep Kijkvenster" - -#: ../vnc.html:97 -msgid "viewport drag" -msgstr "kijkvenster slepen" - -#: ../vnc.html:103 ../vnc.html:106 ../vnc.html:109 ../vnc.html:112 -msgid "Active Mouse Button" -msgstr "Actieve Muisknop" - -#: ../vnc.html:103 -msgid "No mousebutton" -msgstr "Geen muisknop" - -#: ../vnc.html:106 -msgid "Left mousebutton" -msgstr "Linker muisknop" - -#: ../vnc.html:109 -msgid "Middle mousebutton" -msgstr "Middelste muisknop" - -#: ../vnc.html:112 -msgid "Right mousebutton" -msgstr "Rechter muisknop" - -#: ../vnc.html:115 -msgid "Keyboard" -msgstr "Toetsenbord" - -#: ../vnc.html:115 -msgid "Show Keyboard" -msgstr "Toon Toetsenbord" - -#: ../vnc.html:121 -msgid "Extra keys" -msgstr "Extra toetsen" - -#: ../vnc.html:121 -msgid "Show Extra Keys" -msgstr "Toon Extra Toetsen" - -#: ../vnc.html:126 -msgid "Ctrl" -msgstr "Ctrl" - -#: ../vnc.html:126 -msgid "Toggle Ctrl" -msgstr "Ctrl omschakelen" - -#: ../vnc.html:129 -msgid "Alt" -msgstr "Alt" - -#: ../vnc.html:129 -msgid "Toggle Alt" -msgstr "Alt omschakelen" - -#: ../vnc.html:132 -msgid "Toggle Windows" -msgstr "Windows omschakelen" - -#: ../vnc.html:132 -msgid "Windows" -msgstr "Windows" - -#: ../vnc.html:135 -msgid "Send Tab" -msgstr "Tab Sturen" - -#: ../vnc.html:135 -msgid "Tab" -msgstr "Tab" - -#: ../vnc.html:138 -msgid "Esc" -msgstr "Esc" - -#: ../vnc.html:138 -msgid "Send Escape" -msgstr "Escape Sturen" - -#: ../vnc.html:141 -msgid "Ctrl+Alt+Del" -msgstr "Ctrl-Alt-Del" - -#: ../vnc.html:141 -msgid "Send Ctrl-Alt-Del" -msgstr "Ctrl-Alt-Del Sturen" - -#: ../vnc.html:149 -msgid "Shutdown/Reboot" -msgstr "Uitschakelen/Herstarten" - -#: ../vnc.html:149 -msgid "Shutdown/Reboot..." -msgstr "Uitschakelen/Herstarten..." - -#: ../vnc.html:155 -msgid "Power" -msgstr "Systeem" - -#: ../vnc.html:157 -msgid "Shutdown" -msgstr "Uitschakelen" - -#: ../vnc.html:158 -msgid "Reboot" -msgstr "Herstarten" - -#: ../vnc.html:159 -msgid "Reset" -msgstr "Resetten" - -#: ../vnc.html:164 ../vnc.html:170 -msgid "Clipboard" -msgstr "Klembord" - -#: ../vnc.html:174 -msgid "Clear" -msgstr "Wissen" - -#: ../vnc.html:180 -msgid "Fullscreen" -msgstr "Volledig Scherm" - -#: ../vnc.html:185 ../vnc.html:192 -msgid "Settings" -msgstr "Instellingen" - -#: ../vnc.html:195 -msgid "Shared Mode" -msgstr "Gedeelde Modus" - -#: ../vnc.html:198 -msgid "View Only" -msgstr "Alleen Kijken" - -#: ../vnc.html:202 -msgid "Clip to Window" -msgstr "Randen buiten venster afsnijden" - -#: ../vnc.html:205 -msgid "Scaling Mode:" -msgstr "Schaalmodus:" - -#: ../vnc.html:207 -msgid "None" -msgstr "Geen" - -#: ../vnc.html:208 -msgid "Local Scaling" -msgstr "Lokaal Schalen" - -#: ../vnc.html:209 -msgid "Remote Resizing" -msgstr "Op Afstand Formaat Wijzigen" - -#: ../vnc.html:214 -msgid "Advanced" -msgstr "Geavanceerd" - -#: ../vnc.html:217 -msgid "Repeater ID:" -msgstr "Repeater ID:" - -#: ../vnc.html:221 -msgid "WebSocket" -msgstr "WebSocket" - -#: ../vnc.html:224 -msgid "Encrypt" -msgstr "Versleutelen" - -#: ../vnc.html:227 -msgid "Host:" -msgstr "Host:" - -#: ../vnc.html:231 -msgid "Port:" -msgstr "Poort:" - -#: ../vnc.html:235 -msgid "Path:" -msgstr "Pad:" - -#: ../vnc.html:242 -msgid "Automatic Reconnect" -msgstr "Automatisch Opnieuw Verbinden" - -#: ../vnc.html:245 -msgid "Reconnect Delay (ms):" -msgstr "Vertraging voor Opnieuw Verbinden (ms):" - -#: ../vnc.html:250 -msgid "Show Dot when No Cursor" -msgstr "Geef stip weer indien geen cursor" - -#: ../vnc.html:255 -msgid "Logging:" -msgstr "Logmeldingen:" - -#: ../vnc.html:267 -msgid "Disconnect" -msgstr "Verbinding verbreken" - -#: ../vnc.html:286 -msgid "Connect" -msgstr "Verbinden" - -#: ../vnc.html:296 -msgid "Password:" -msgstr "Wachtwoord:" - -#: ../vnc.html:300 -msgid "Send Password" -msgstr "Verzend Wachtwoord:" - -#: ../vnc.html:310 -msgid "Cancel" -msgstr "Annuleren" - -#~ msgid "Disconnect timeout" -#~ msgstr "Timeout tijdens verbreken van verbinding" - -#~ msgid "Local Downscaling" -#~ msgstr "Lokaal Neerschalen" - -#~ msgid "Local Cursor" -#~ msgstr "Lokale Cursor" - -#~ msgid "Canvas not supported." -#~ msgstr "Canvas wordt niet ondersteund." - -#~ msgid "" -#~ "Forcing clipping mode since scrollbars aren't supported by IE in " -#~ "fullscreen" -#~ msgstr "" -#~ "''Clipping mode' ingeschakeld, omdat schuifbalken in volledige-scherm-" -#~ "modus in IE niet worden ondersteund" diff --git a/systemvm/agent/noVNC/po/noVNC.pot b/systemvm/agent/noVNC/po/noVNC.pot deleted file mode 100644 index 200be01de6e8..000000000000 --- a/systemvm/agent/noVNC/po/noVNC.pot +++ /dev/null @@ -1,302 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR The noVNC Authors -# This file is distributed under the same license as the noVNC package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: noVNC 1.1.0\n" -"Report-Msgid-Bugs-To: novnc@googlegroups.com\n" -"POT-Creation-Date: 2019-01-16 11:06+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../app/ui.js:387 -msgid "Connecting..." -msgstr "" - -#: ../app/ui.js:394 -msgid "Disconnecting..." -msgstr "" - -#: ../app/ui.js:400 -msgid "Reconnecting..." -msgstr "" - -#: ../app/ui.js:405 -msgid "Internal error" -msgstr "" - -#: ../app/ui.js:995 -msgid "Must set host" -msgstr "" - -#: ../app/ui.js:1077 -msgid "Connected (encrypted) to " -msgstr "" - -#: ../app/ui.js:1079 -msgid "Connected (unencrypted) to " -msgstr "" - -#: ../app/ui.js:1102 -msgid "Something went wrong, connection is closed" -msgstr "" - -#: ../app/ui.js:1105 -msgid "Failed to connect to server" -msgstr "" - -#: ../app/ui.js:1115 -msgid "Disconnected" -msgstr "" - -#: ../app/ui.js:1128 -msgid "New connection has been rejected with reason: " -msgstr "" - -#: ../app/ui.js:1131 -msgid "New connection has been rejected" -msgstr "" - -#: ../app/ui.js:1151 -msgid "Password is required" -msgstr "" - -#: ../vnc.html:84 -msgid "noVNC encountered an error:" -msgstr "" - -#: ../vnc.html:94 -msgid "Hide/Show the control bar" -msgstr "" - -#: ../vnc.html:101 -msgid "Move/Drag Viewport" -msgstr "" - -#: ../vnc.html:101 -msgid "viewport drag" -msgstr "" - -#: ../vnc.html:107 ../vnc.html:110 ../vnc.html:113 ../vnc.html:116 -msgid "Active Mouse Button" -msgstr "" - -#: ../vnc.html:107 -msgid "No mousebutton" -msgstr "" - -#: ../vnc.html:110 -msgid "Left mousebutton" -msgstr "" - -#: ../vnc.html:113 -msgid "Middle mousebutton" -msgstr "" - -#: ../vnc.html:116 -msgid "Right mousebutton" -msgstr "" - -#: ../vnc.html:119 -msgid "Keyboard" -msgstr "" - -#: ../vnc.html:119 -msgid "Show Keyboard" -msgstr "" - -#: ../vnc.html:126 -msgid "Extra keys" -msgstr "" - -#: ../vnc.html:126 -msgid "Show Extra Keys" -msgstr "" - -#: ../vnc.html:131 -msgid "Ctrl" -msgstr "" - -#: ../vnc.html:131 -msgid "Toggle Ctrl" -msgstr "" - -#: ../vnc.html:134 -msgid "Alt" -msgstr "" - -#: ../vnc.html:134 -msgid "Toggle Alt" -msgstr "" - -#: ../vnc.html:137 -msgid "Toggle Windows" -msgstr "" - -#: ../vnc.html:137 -msgid "Windows" -msgstr "" - -#: ../vnc.html:140 -msgid "Send Tab" -msgstr "" - -#: ../vnc.html:140 -msgid "Tab" -msgstr "" - -#: ../vnc.html:143 -msgid "Esc" -msgstr "" - -#: ../vnc.html:143 -msgid "Send Escape" -msgstr "" - -#: ../vnc.html:146 -msgid "Ctrl+Alt+Del" -msgstr "" - -#: ../vnc.html:146 -msgid "Send Ctrl-Alt-Del" -msgstr "" - -#: ../vnc.html:154 -msgid "Shutdown/Reboot" -msgstr "" - -#: ../vnc.html:154 -msgid "Shutdown/Reboot..." -msgstr "" - -#: ../vnc.html:160 -msgid "Power" -msgstr "" - -#: ../vnc.html:162 -msgid "Shutdown" -msgstr "" - -#: ../vnc.html:163 -msgid "Reboot" -msgstr "" - -#: ../vnc.html:164 -msgid "Reset" -msgstr "" - -#: ../vnc.html:169 ../vnc.html:175 -msgid "Clipboard" -msgstr "" - -#: ../vnc.html:179 -msgid "Clear" -msgstr "" - -#: ../vnc.html:185 -msgid "Fullscreen" -msgstr "" - -#: ../vnc.html:190 ../vnc.html:197 -msgid "Settings" -msgstr "" - -#: ../vnc.html:200 -msgid "Shared Mode" -msgstr "" - -#: ../vnc.html:203 -msgid "View Only" -msgstr "" - -#: ../vnc.html:207 -msgid "Clip to Window" -msgstr "" - -#: ../vnc.html:210 -msgid "Scaling Mode:" -msgstr "" - -#: ../vnc.html:212 -msgid "None" -msgstr "" - -#: ../vnc.html:213 -msgid "Local Scaling" -msgstr "" - -#: ../vnc.html:214 -msgid "Remote Resizing" -msgstr "" - -#: ../vnc.html:219 -msgid "Advanced" -msgstr "" - -#: ../vnc.html:222 -msgid "Repeater ID:" -msgstr "" - -#: ../vnc.html:226 -msgid "WebSocket" -msgstr "" - -#: ../vnc.html:229 -msgid "Encrypt" -msgstr "" - -#: ../vnc.html:232 -msgid "Host:" -msgstr "" - -#: ../vnc.html:236 -msgid "Port:" -msgstr "" - -#: ../vnc.html:240 -msgid "Path:" -msgstr "" - -#: ../vnc.html:247 -msgid "Automatic Reconnect" -msgstr "" - -#: ../vnc.html:250 -msgid "Reconnect Delay (ms):" -msgstr "" - -#: ../vnc.html:255 -msgid "Show Dot when No Cursor" -msgstr "" - -#: ../vnc.html:260 -msgid "Logging:" -msgstr "" - -#: ../vnc.html:272 -msgid "Disconnect" -msgstr "" - -#: ../vnc.html:291 -msgid "Connect" -msgstr "" - -#: ../vnc.html:301 -msgid "Password:" -msgstr "" - -#: ../vnc.html:305 -msgid "Send Password" -msgstr "" - -#: ../vnc.html:315 -msgid "Cancel" -msgstr "" diff --git a/systemvm/agent/noVNC/po/pl.po b/systemvm/agent/noVNC/po/pl.po deleted file mode 100644 index 5acfdc4f4b83..000000000000 --- a/systemvm/agent/noVNC/po/pl.po +++ /dev/null @@ -1,325 +0,0 @@ -# Polish translations for noVNC package. -# Copyright (C) 2018 The noVNC Authors -# This file is distributed under the same license as the noVNC package. -# Mariusz Jamro , 2017. -# -msgid "" -msgstr "" -"Project-Id-Version: noVNC 0.6.1\n" -"Report-Msgid-Bugs-To: novnc@googlegroups.com\n" -"POT-Creation-Date: 2017-11-21 19:53+0100\n" -"PO-Revision-Date: 2017-11-21 19:54+0100\n" -"Last-Translator: Mariusz Jamro \n" -"Language-Team: Polish\n" -"Language: pl\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2);\n" -"X-Generator: Poedit 2.0.1\n" - -#: ../app/ui.js:404 -msgid "Connecting..." -msgstr "Łączenie..." - -#: ../app/ui.js:411 -msgid "Disconnecting..." -msgstr "Rozłączanie..." - -#: ../app/ui.js:417 -msgid "Reconnecting..." -msgstr "Łączenie..." - -#: ../app/ui.js:422 -msgid "Internal error" -msgstr "Błąd wewnętrzny" - -#: ../app/ui.js:1019 -msgid "Must set host" -msgstr "Host i port są wymagane" - -#: ../app/ui.js:1099 -msgid "Connected (encrypted) to " -msgstr "Połączenie (szyfrowane) z " - -#: ../app/ui.js:1101 -msgid "Connected (unencrypted) to " -msgstr "Połączenie (nieszyfrowane) z " - -#: ../app/ui.js:1119 -msgid "Something went wrong, connection is closed" -msgstr "Coś poszło źle, połączenie zostało zamknięte" - -#: ../app/ui.js:1129 -msgid "Disconnected" -msgstr "Rozłączony" - -#: ../app/ui.js:1142 -msgid "New connection has been rejected with reason: " -msgstr "Nowe połączenie zostało odrzucone z powodu: " - -#: ../app/ui.js:1145 -msgid "New connection has been rejected" -msgstr "Nowe połączenie zostało odrzucone" - -#: ../app/ui.js:1166 -msgid "Password is required" -msgstr "Hasło jest wymagane" - -#: ../vnc.html:89 -msgid "noVNC encountered an error:" -msgstr "noVNC napotkało błąd:" - -#: ../vnc.html:99 -msgid "Hide/Show the control bar" -msgstr "Pokaż/Ukryj pasek ustawień" - -#: ../vnc.html:106 -msgid "Move/Drag Viewport" -msgstr "Ruszaj/Przeciągaj Viewport" - -#: ../vnc.html:106 -msgid "viewport drag" -msgstr "przeciągnij viewport" - -#: ../vnc.html:112 ../vnc.html:115 ../vnc.html:118 ../vnc.html:121 -msgid "Active Mouse Button" -msgstr "Aktywny Przycisk Myszy" - -#: ../vnc.html:112 -msgid "No mousebutton" -msgstr "Brak przycisku myszy" - -#: ../vnc.html:115 -msgid "Left mousebutton" -msgstr "Lewy przycisk myszy" - -#: ../vnc.html:118 -msgid "Middle mousebutton" -msgstr "Środkowy przycisk myszy" - -#: ../vnc.html:121 -msgid "Right mousebutton" -msgstr "Prawy przycisk myszy" - -#: ../vnc.html:124 -msgid "Keyboard" -msgstr "Klawiatura" - -#: ../vnc.html:124 -msgid "Show Keyboard" -msgstr "Pokaż klawiaturę" - -#: ../vnc.html:131 -msgid "Extra keys" -msgstr "Przyciski dodatkowe" - -#: ../vnc.html:131 -msgid "Show Extra Keys" -msgstr "Pokaż przyciski dodatkowe" - -#: ../vnc.html:136 -msgid "Ctrl" -msgstr "Ctrl" - -#: ../vnc.html:136 -msgid "Toggle Ctrl" -msgstr "Przełącz Ctrl" - -#: ../vnc.html:139 -msgid "Alt" -msgstr "Alt" - -#: ../vnc.html:139 -msgid "Toggle Alt" -msgstr "Przełącz Alt" - -#: ../vnc.html:142 -msgid "Send Tab" -msgstr "Wyślij Tab" - -#: ../vnc.html:142 -msgid "Tab" -msgstr "Tab" - -#: ../vnc.html:145 -msgid "Esc" -msgstr "Esc" - -#: ../vnc.html:145 -msgid "Send Escape" -msgstr "Wyślij Escape" - -#: ../vnc.html:148 -msgid "Ctrl+Alt+Del" -msgstr "Ctrl+Alt+Del" - -#: ../vnc.html:148 -msgid "Send Ctrl-Alt-Del" -msgstr "Wyślij Ctrl-Alt-Del" - -#: ../vnc.html:156 -msgid "Shutdown/Reboot" -msgstr "Wyłącz/Uruchom ponownie" - -#: ../vnc.html:156 -msgid "Shutdown/Reboot..." -msgstr "Wyłącz/Uruchom ponownie..." - -#: ../vnc.html:162 -msgid "Power" -msgstr "Włączony" - -#: ../vnc.html:164 -msgid "Shutdown" -msgstr "Wyłącz" - -#: ../vnc.html:165 -msgid "Reboot" -msgstr "Uruchom ponownie" - -#: ../vnc.html:166 -msgid "Reset" -msgstr "Resetuj" - -#: ../vnc.html:171 ../vnc.html:177 -msgid "Clipboard" -msgstr "Schowek" - -#: ../vnc.html:181 -msgid "Clear" -msgstr "Wyczyść" - -#: ../vnc.html:187 -msgid "Fullscreen" -msgstr "Pełny ekran" - -#: ../vnc.html:192 ../vnc.html:199 -msgid "Settings" -msgstr "Ustawienia" - -#: ../vnc.html:202 -msgid "Shared Mode" -msgstr "Tryb Współdzielenia" - -#: ../vnc.html:205 -msgid "View Only" -msgstr "Tylko Podgląd" - -#: ../vnc.html:209 -msgid "Clip to Window" -msgstr "Przytnij do Okna" - -#: ../vnc.html:212 -msgid "Scaling Mode:" -msgstr "Tryb Skalowania:" - -#: ../vnc.html:214 -msgid "None" -msgstr "Brak" - -#: ../vnc.html:215 -msgid "Local Scaling" -msgstr "Skalowanie lokalne" - -#: ../vnc.html:216 -msgid "Remote Resizing" -msgstr "Skalowanie zdalne" - -#: ../vnc.html:221 -msgid "Advanced" -msgstr "Zaawansowane" - -#: ../vnc.html:224 -msgid "Repeater ID:" -msgstr "ID Repeatera:" - -#: ../vnc.html:228 -msgid "WebSocket" -msgstr "WebSocket" - -#: ../vnc.html:231 -msgid "Encrypt" -msgstr "Szyfrowanie" - -#: ../vnc.html:234 -msgid "Host:" -msgstr "Host:" - -#: ../vnc.html:238 -msgid "Port:" -msgstr "Port:" - -#: ../vnc.html:242 -msgid "Path:" -msgstr "Ścieżka:" - -#: ../vnc.html:249 -msgid "Automatic Reconnect" -msgstr "Automatycznie wznawiaj połączenie" - -#: ../vnc.html:252 -msgid "Reconnect Delay (ms):" -msgstr "Opóźnienie wznawiania (ms):" - -#: ../vnc.html:258 -msgid "Logging:" -msgstr "Poziom logowania:" - -#: ../vnc.html:270 -msgid "Disconnect" -msgstr "Rozłącz" - -#: ../vnc.html:289 -msgid "Connect" -msgstr "Połącz" - -#: ../vnc.html:299 -msgid "Password:" -msgstr "Hasło:" - -#: ../vnc.html:313 -msgid "Cancel" -msgstr "Anuluj" - -#: ../vnc.html:329 -msgid "Canvas not supported." -msgstr "Element Canvas nie jest wspierany." - -#~ msgid "Disconnect timeout" -#~ msgstr "Timeout rozłączenia" - -#~ msgid "Local Downscaling" -#~ msgstr "Downscaling lokalny" - -#~ msgid "Local Cursor" -#~ msgstr "Lokalny kursor" - -#~ msgid "" -#~ "Forcing clipping mode since scrollbars aren't supported by IE in " -#~ "fullscreen" -#~ msgstr "" -#~ "Wymuszam clipping mode ponieważ paski przewijania nie są wspierane przez " -#~ "IE w trybie pełnoekranowym" - -#~ msgid "True Color" -#~ msgstr "True Color" - -#~ msgid "Style:" -#~ msgstr "Styl:" - -#~ msgid "default" -#~ msgstr "domyślny" - -#~ msgid "Apply" -#~ msgstr "Zapisz" - -#~ msgid "Connection" -#~ msgstr "Połączenie" - -#~ msgid "Token:" -#~ msgstr "Token:" - -#~ msgid "Send Password" -#~ msgstr "Wyślij Hasło" diff --git a/systemvm/agent/noVNC/po/po2js b/systemvm/agent/noVNC/po/po2js deleted file mode 100755 index 03c14900fff9..000000000000 --- a/systemvm/agent/noVNC/po/po2js +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env node -/* - * ps2js: gettext .po to noVNC .js converter - * Copyright (C) 2018 The noVNC Authors - * - * 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, either version 3 of the License, or - * (at your option) any later version. - * - * 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 . - */ - -const getopt = require('node-getopt'); -const fs = require('fs'); -const po2json = require("po2json"); - -const opt = getopt.create([ - ['h' , 'help' , 'display this help'], -]).bindHelp().parseSystem(); - -if (opt.argv.length != 2) { - console.error("Incorrect number of arguments given"); - process.exit(1); -} - -const data = po2json.parseFileSync(opt.argv[0]); - -const bodyPart = Object.keys(data).filter((msgid) => msgid !== "").map((msgid) => { - if (msgid === "") return; - const msgstr = data[msgid][1]; - return " " + JSON.stringify(msgid) + ": " + JSON.stringify(msgstr); -}).join(",\n"); - -const output = "{\n" + bodyPart + "\n}"; - -fs.writeFileSync(opt.argv[1], output); diff --git a/systemvm/agent/noVNC/po/ru.po b/systemvm/agent/noVNC/po/ru.po deleted file mode 100644 index fb5d0875ef89..000000000000 --- a/systemvm/agent/noVNC/po/ru.po +++ /dev/null @@ -1,306 +0,0 @@ -# Russian translations for noVNC package -# Русский перевод для пакета noVNC. -# Copyright (C) 2019 Dmitriy Shweew -# This file is distributed under the same license as the noVNC package. -# Dmitriy Shweew , 2019. -# -msgid "" -msgstr "" -"Project-Id-Version: noVNC 1.1.0\n" -"Report-Msgid-Bugs-To: novnc@googlegroups.com\n" -"POT-Creation-Date: 2019-02-26 14:53+0400\n" -"PO-Revision-Date: 2019-02-17 17:29+0400\n" -"Last-Translator: Dmitriy Shweew \n" -"Language-Team: Russian\n" -"Language: ru\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Poedit 2.2.1\n" -"X-Poedit-Flags-xgettext: --add-comments\n" - -#: ../app/ui.js:387 -msgid "Connecting..." -msgstr "Подключение..." - -#: ../app/ui.js:394 -msgid "Disconnecting..." -msgstr "Отключение..." - -#: ../app/ui.js:400 -msgid "Reconnecting..." -msgstr "Переподключение..." - -#: ../app/ui.js:405 -msgid "Internal error" -msgstr "Внутренняя ошибка" - -#: ../app/ui.js:995 -msgid "Must set host" -msgstr "Задайте имя сервера или IP" - -#: ../app/ui.js:1077 -msgid "Connected (encrypted) to " -msgstr "Подключено (с шифрованием) к " - -#: ../app/ui.js:1079 -msgid "Connected (unencrypted) to " -msgstr "Подключено (без шифрования) к " - -#: ../app/ui.js:1102 -msgid "Something went wrong, connection is closed" -msgstr "Что-то пошло не так, подключение разорвано" - -#: ../app/ui.js:1105 -msgid "Failed to connect to server" -msgstr "Ошибка подключения к серверу" - -#: ../app/ui.js:1115 -msgid "Disconnected" -msgstr "Отключено" - -#: ../app/ui.js:1128 -msgid "New connection has been rejected with reason: " -msgstr "Подключиться не удалось: " - -#: ../app/ui.js:1131 -msgid "New connection has been rejected" -msgstr "Подключиться не удалось" - -#: ../app/ui.js:1151 -msgid "Password is required" -msgstr "Требуется пароль" - -#: ../vnc.html:84 -msgid "noVNC encountered an error:" -msgstr "Ошибка noVNC: " - -#: ../vnc.html:94 -msgid "Hide/Show the control bar" -msgstr "Скрыть/Показать контрольную панель" - -#: ../vnc.html:101 -msgid "Move/Drag Viewport" -msgstr "Переместить окно" - -#: ../vnc.html:101 -msgid "viewport drag" -msgstr "Переместить окно" - -#: ../vnc.html:107 ../vnc.html:110 ../vnc.html:113 ../vnc.html:116 -msgid "Active Mouse Button" -msgstr "Активировать кнопки мыши" - -#: ../vnc.html:107 -msgid "No mousebutton" -msgstr "Отключить кнопки мыши" - -#: ../vnc.html:110 -msgid "Left mousebutton" -msgstr "Левая кнопка мыши" - -#: ../vnc.html:113 -msgid "Middle mousebutton" -msgstr "Средняя кнопка мыши" - -#: ../vnc.html:116 -msgid "Right mousebutton" -msgstr "Правая кнопка мыши" - -#: ../vnc.html:119 -msgid "Keyboard" -msgstr "Клавиатура" - -#: ../vnc.html:119 -msgid "Show Keyboard" -msgstr "Показать клавиатуру" - -#: ../vnc.html:126 -msgid "Extra keys" -msgstr "Доп. кнопки" - -#: ../vnc.html:126 -msgid "Show Extra Keys" -msgstr "Показать дополнительные кнопки" - -#: ../vnc.html:131 -msgid "Ctrl" -msgstr "Ctrl" - -#: ../vnc.html:131 -msgid "Toggle Ctrl" -msgstr "Передать нажатие Ctrl" - -#: ../vnc.html:134 -msgid "Alt" -msgstr "Alt" - -#: ../vnc.html:134 -msgid "Toggle Alt" -msgstr "Передать нажатие Alt" - -#: ../vnc.html:137 -msgid "Toggle Windows" -msgstr "Переключение вкладок" - -#: ../vnc.html:137 -msgid "Windows" -msgstr "Вкладка" - -#: ../vnc.html:140 -msgid "Send Tab" -msgstr "Передать нажатие Tab" - -#: ../vnc.html:140 -msgid "Tab" -msgstr "Tab" - -#: ../vnc.html:143 -msgid "Esc" -msgstr "Esc" - -#: ../vnc.html:143 -msgid "Send Escape" -msgstr "Передать нажатие Escape" - -#: ../vnc.html:146 -msgid "Ctrl+Alt+Del" -msgstr "Ctrl+Alt+Del" - -#: ../vnc.html:146 -msgid "Send Ctrl-Alt-Del" -msgstr "Передать нажатие Ctrl-Alt-Del" - -#: ../vnc.html:154 -msgid "Shutdown/Reboot" -msgstr "Выключить/Перезагрузить" - -#: ../vnc.html:154 -msgid "Shutdown/Reboot..." -msgstr "Выключить/Перезагрузить..." - -#: ../vnc.html:160 -msgid "Power" -msgstr "Питание" - -#: ../vnc.html:162 -msgid "Shutdown" -msgstr "Выключить" - -#: ../vnc.html:163 -msgid "Reboot" -msgstr "Перезагрузить" - -#: ../vnc.html:164 -msgid "Reset" -msgstr "Сброс" - -#: ../vnc.html:169 ../vnc.html:175 -msgid "Clipboard" -msgstr "Буфер обмена" - -#: ../vnc.html:179 -msgid "Clear" -msgstr "Очистить" - -#: ../vnc.html:185 -msgid "Fullscreen" -msgstr "Во весь экран" - -#: ../vnc.html:190 ../vnc.html:197 -msgid "Settings" -msgstr "Настройки" - -#: ../vnc.html:200 -msgid "Shared Mode" -msgstr "Общий режим" - -#: ../vnc.html:203 -msgid "View Only" -msgstr "Просмотр" - -#: ../vnc.html:207 -msgid "Clip to Window" -msgstr "В окно" - -#: ../vnc.html:210 -msgid "Scaling Mode:" -msgstr "Масштаб:" - -#: ../vnc.html:212 -msgid "None" -msgstr "Нет" - -#: ../vnc.html:213 -msgid "Local Scaling" -msgstr "Локльный масштаб" - -#: ../vnc.html:214 -msgid "Remote Resizing" -msgstr "Удаленный масштаб" - -#: ../vnc.html:219 -msgid "Advanced" -msgstr "Дополнительно" - -#: ../vnc.html:222 -msgid "Repeater ID:" -msgstr "Идентификатор ID:" - -#: ../vnc.html:226 -msgid "WebSocket" -msgstr "WebSocket" - -#: ../vnc.html:229 -msgid "Encrypt" -msgstr "Шифрование" - -#: ../vnc.html:232 -msgid "Host:" -msgstr "Сервер:" - -#: ../vnc.html:236 -msgid "Port:" -msgstr "Порт:" - -#: ../vnc.html:240 -msgid "Path:" -msgstr "Путь:" - -#: ../vnc.html:247 -msgid "Automatic Reconnect" -msgstr "Автоматическое переподключение" - -#: ../vnc.html:250 -msgid "Reconnect Delay (ms):" -msgstr "Задержка переподключения (мс):" - -#: ../vnc.html:255 -msgid "Show Dot when No Cursor" -msgstr "Показать точку вместо курсора" - -#: ../vnc.html:260 -msgid "Logging:" -msgstr "Лог:" - -#: ../vnc.html:272 -msgid "Disconnect" -msgstr "Отключение" - -#: ../vnc.html:291 -msgid "Connect" -msgstr "Подключение" - -#: ../vnc.html:301 -msgid "Password:" -msgstr "Пароль:" - -#: ../vnc.html:305 -msgid "Send Password" -msgstr "Пароль: " - -#: ../vnc.html:315 -msgid "Cancel" -msgstr "Выход" diff --git a/systemvm/agent/noVNC/po/sv.po b/systemvm/agent/noVNC/po/sv.po deleted file mode 100644 index f79556629572..000000000000 --- a/systemvm/agent/noVNC/po/sv.po +++ /dev/null @@ -1,316 +0,0 @@ -# Swedish translations for noVNC package -# Svenska översättningar för paket noVNC. -# Copyright (C) 2018 The noVNC Authors -# This file is distributed under the same license as the noVNC package. -# Samuel Mannehed , 2019. -# -msgid "" -msgstr "" -"Project-Id-Version: noVNC 1.1.0\n" -"Report-Msgid-Bugs-To: novnc@googlegroups.com\n" -"POT-Creation-Date: 2019-01-16 11:06+0100\n" -"PO-Revision-Date: 2019-04-08 10:18+0200\n" -"Last-Translator: Samuel Mannehed \n" -"Language-Team: none\n" -"Language: sv\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 2.0.3\n" - -#: ../app/ui.js:387 -msgid "Connecting..." -msgstr "Ansluter..." - -#: ../app/ui.js:394 -msgid "Disconnecting..." -msgstr "Kopplar ner..." - -#: ../app/ui.js:400 -msgid "Reconnecting..." -msgstr "Återansluter..." - -#: ../app/ui.js:405 -msgid "Internal error" -msgstr "Internt fel" - -#: ../app/ui.js:995 -msgid "Must set host" -msgstr "Du måste specifiera en värd" - -#: ../app/ui.js:1077 -msgid "Connected (encrypted) to " -msgstr "Ansluten (krypterat) till " - -#: ../app/ui.js:1079 -msgid "Connected (unencrypted) to " -msgstr "Ansluten (okrypterat) till " - -#: ../app/ui.js:1102 -msgid "Something went wrong, connection is closed" -msgstr "Något gick fel, anslutningen avslutades" - -#: ../app/ui.js:1105 -msgid "Failed to connect to server" -msgstr "Misslyckades att ansluta till servern" - -#: ../app/ui.js:1115 -msgid "Disconnected" -msgstr "Frånkopplad" - -#: ../app/ui.js:1128 -msgid "New connection has been rejected with reason: " -msgstr "Ny anslutning har blivit nekad med följande skäl: " - -#: ../app/ui.js:1131 -msgid "New connection has been rejected" -msgstr "Ny anslutning har blivit nekad" - -#: ../app/ui.js:1151 -msgid "Password is required" -msgstr "Lösenord krävs" - -#: ../vnc.html:84 -msgid "noVNC encountered an error:" -msgstr "noVNC stötte på ett problem:" - -#: ../vnc.html:94 -msgid "Hide/Show the control bar" -msgstr "Göm/Visa kontrollbaren" - -#: ../vnc.html:101 -msgid "Move/Drag Viewport" -msgstr "Flytta/Dra Vyn" - -#: ../vnc.html:101 -msgid "viewport drag" -msgstr "dra vy" - -#: ../vnc.html:107 ../vnc.html:110 ../vnc.html:113 ../vnc.html:116 -msgid "Active Mouse Button" -msgstr "Aktiv musknapp" - -#: ../vnc.html:107 -msgid "No mousebutton" -msgstr "Ingen musknapp" - -#: ../vnc.html:110 -msgid "Left mousebutton" -msgstr "Vänster musknapp" - -#: ../vnc.html:113 -msgid "Middle mousebutton" -msgstr "Mitten-musknapp" - -#: ../vnc.html:116 -msgid "Right mousebutton" -msgstr "Höger musknapp" - -#: ../vnc.html:119 -msgid "Keyboard" -msgstr "Tangentbord" - -#: ../vnc.html:119 -msgid "Show Keyboard" -msgstr "Visa Tangentbord" - -#: ../vnc.html:126 -msgid "Extra keys" -msgstr "Extraknappar" - -#: ../vnc.html:126 -msgid "Show Extra Keys" -msgstr "Visa Extraknappar" - -#: ../vnc.html:131 -msgid "Ctrl" -msgstr "Ctrl" - -#: ../vnc.html:131 -msgid "Toggle Ctrl" -msgstr "Växla Ctrl" - -#: ../vnc.html:134 -msgid "Alt" -msgstr "Alt" - -#: ../vnc.html:134 -msgid "Toggle Alt" -msgstr "Växla Alt" - -#: ../vnc.html:137 -msgid "Toggle Windows" -msgstr "Växla Windows" - -#: ../vnc.html:137 -msgid "Windows" -msgstr "Windows" - -#: ../vnc.html:140 -msgid "Send Tab" -msgstr "Skicka Tab" - -#: ../vnc.html:140 -msgid "Tab" -msgstr "Tab" - -#: ../vnc.html:143 -msgid "Esc" -msgstr "Esc" - -#: ../vnc.html:143 -msgid "Send Escape" -msgstr "Skicka Escape" - -#: ../vnc.html:146 -msgid "Ctrl+Alt+Del" -msgstr "Ctrl+Alt+Del" - -#: ../vnc.html:146 -msgid "Send Ctrl-Alt-Del" -msgstr "Skicka Ctrl-Alt-Del" - -#: ../vnc.html:154 -msgid "Shutdown/Reboot" -msgstr "Stäng av/Boota om" - -#: ../vnc.html:154 -msgid "Shutdown/Reboot..." -msgstr "Stäng av/Boota om..." - -#: ../vnc.html:160 -msgid "Power" -msgstr "Ström" - -#: ../vnc.html:162 -msgid "Shutdown" -msgstr "Stäng av" - -#: ../vnc.html:163 -msgid "Reboot" -msgstr "Boota om" - -#: ../vnc.html:164 -msgid "Reset" -msgstr "Återställ" - -#: ../vnc.html:169 ../vnc.html:175 -msgid "Clipboard" -msgstr "Urklipp" - -#: ../vnc.html:179 -msgid "Clear" -msgstr "Rensa" - -#: ../vnc.html:185 -msgid "Fullscreen" -msgstr "Fullskärm" - -#: ../vnc.html:190 ../vnc.html:197 -msgid "Settings" -msgstr "Inställningar" - -#: ../vnc.html:200 -msgid "Shared Mode" -msgstr "Delat Läge" - -#: ../vnc.html:203 -msgid "View Only" -msgstr "Endast Visning" - -#: ../vnc.html:207 -msgid "Clip to Window" -msgstr "Begränsa till Fönster" - -#: ../vnc.html:210 -msgid "Scaling Mode:" -msgstr "Skalningsläge:" - -#: ../vnc.html:212 -msgid "None" -msgstr "Ingen" - -#: ../vnc.html:213 -msgid "Local Scaling" -msgstr "Lokal Skalning" - -#: ../vnc.html:214 -msgid "Remote Resizing" -msgstr "Ändra Storlek" - -#: ../vnc.html:219 -msgid "Advanced" -msgstr "Avancerat" - -#: ../vnc.html:222 -msgid "Repeater ID:" -msgstr "Repeater-ID:" - -#: ../vnc.html:226 -msgid "WebSocket" -msgstr "WebSocket" - -#: ../vnc.html:229 -msgid "Encrypt" -msgstr "Kryptera" - -#: ../vnc.html:232 -msgid "Host:" -msgstr "Värd:" - -#: ../vnc.html:236 -msgid "Port:" -msgstr "Port:" - -#: ../vnc.html:240 -msgid "Path:" -msgstr "Sökväg:" - -#: ../vnc.html:247 -msgid "Automatic Reconnect" -msgstr "Automatisk Återanslutning" - -#: ../vnc.html:250 -msgid "Reconnect Delay (ms):" -msgstr "Fördröjning (ms):" - -#: ../vnc.html:255 -msgid "Show Dot when No Cursor" -msgstr "Visa prick när ingen muspekare finns" - -#: ../vnc.html:260 -msgid "Logging:" -msgstr "Loggning:" - -#: ../vnc.html:272 -msgid "Disconnect" -msgstr "Koppla från" - -#: ../vnc.html:291 -msgid "Connect" -msgstr "Anslut" - -#: ../vnc.html:301 -msgid "Password:" -msgstr "Lösenord:" - -#: ../vnc.html:305 -msgid "Send Password" -msgstr "Skicka lösenord" - -#: ../vnc.html:315 -msgid "Cancel" -msgstr "Avbryt" - -#~ msgid "Disconnect timeout" -#~ msgstr "Det tog för lång tid att koppla ner" - -#~ msgid "Local Downscaling" -#~ msgstr "Lokal Nedskalning" - -#~ msgid "Local Cursor" -#~ msgstr "Lokal Muspekare" - -#~ msgid "Canvas not supported." -#~ msgstr "Canvas stöds ej" diff --git a/systemvm/agent/noVNC/po/tr.po b/systemvm/agent/noVNC/po/tr.po deleted file mode 100644 index 8b5c1813455e..000000000000 --- a/systemvm/agent/noVNC/po/tr.po +++ /dev/null @@ -1,288 +0,0 @@ -# Turkish translations for noVNC package -# Turkish translation for noVNC. -# Copyright (C) 2018 The noVNC Authors -# This file is distributed under the same license as the noVNC package. -# Ömer ÇAKMAK , 2018. -# -msgid "" -msgstr "" -"Project-Id-Version: noVNC 0.6.1\n" -"Report-Msgid-Bugs-To: novnc@googlegroups.com\n" -"POT-Creation-Date: 2017-11-24 07:16+0000\n" -"PO-Revision-Date: 2018-01-05 19:07+0300\n" -"Last-Translator: Ömer ÇAKMAK \n" -"Language-Team: Türkçe \n" -"Language: tr\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Gtranslator 2.91.7\n" - -#: ../app/ui.js:404 -msgid "Connecting..." -msgstr "Bağlanıyor..." - -#: ../app/ui.js:411 -msgid "Disconnecting..." -msgstr "Bağlantı kesiliyor..." - -#: ../app/ui.js:417 -msgid "Reconnecting..." -msgstr "Yeniden bağlantı kuruluyor..." - -#: ../app/ui.js:422 -msgid "Internal error" -msgstr "İç hata" - -#: ../app/ui.js:1019 -msgid "Must set host" -msgstr "Sunucuyu kur" - -#: ../app/ui.js:1099 -msgid "Connected (encrypted) to " -msgstr "Bağlı (şifrelenmiş)" - -#: ../app/ui.js:1101 -msgid "Connected (unencrypted) to " -msgstr "Bağlandı (şifrelenmemiş)" - -#: ../app/ui.js:1119 -msgid "Something went wrong, connection is closed" -msgstr "Bir şeyler ters gitti, bağlantı kesildi" - -#: ../app/ui.js:1129 -msgid "Disconnected" -msgstr "Bağlantı kesildi" - -#: ../app/ui.js:1142 -msgid "New connection has been rejected with reason: " -msgstr "Bağlantı aşağıdaki nedenlerden dolayı reddedildi: " - -#: ../app/ui.js:1145 -msgid "New connection has been rejected" -msgstr "Bağlantı reddedildi" - -#: ../app/ui.js:1166 -msgid "Password is required" -msgstr "Şifre gerekli" - -#: ../vnc.html:89 -msgid "noVNC encountered an error:" -msgstr "Bir hata oluştu:" - -#: ../vnc.html:99 -msgid "Hide/Show the control bar" -msgstr "Denetim masasını Gizle/Göster" - -#: ../vnc.html:106 -msgid "Move/Drag Viewport" -msgstr "Görünümü Taşı/Sürükle" - -#: ../vnc.html:106 -msgid "viewport drag" -msgstr "Görüntü penceresini sürükle" - -#: ../vnc.html:112 ../vnc.html:115 ../vnc.html:118 ../vnc.html:121 -msgid "Active Mouse Button" -msgstr "Aktif Fare Düğmesi" - -#: ../vnc.html:112 -msgid "No mousebutton" -msgstr "Fare düğmesi yok" - -#: ../vnc.html:115 -msgid "Left mousebutton" -msgstr "Farenin sol düğmesi" - -#: ../vnc.html:118 -msgid "Middle mousebutton" -msgstr "Farenin orta düğmesi" - -#: ../vnc.html:121 -msgid "Right mousebutton" -msgstr "Farenin sağ düğmesi" - -#: ../vnc.html:124 -msgid "Keyboard" -msgstr "Klavye" - -#: ../vnc.html:124 -msgid "Show Keyboard" -msgstr "Klavye Düzenini Göster" - -#: ../vnc.html:131 -msgid "Extra keys" -msgstr "Ekstra tuşlar" - -#: ../vnc.html:131 -msgid "Show Extra Keys" -msgstr "Ekstra tuşları göster" - -#: ../vnc.html:136 -msgid "Ctrl" -msgstr "Ctrl" - -#: ../vnc.html:136 -msgid "Toggle Ctrl" -msgstr "Ctrl Değiştir " - -#: ../vnc.html:139 -msgid "Alt" -msgstr "Alt" - -#: ../vnc.html:139 -msgid "Toggle Alt" -msgstr "Alt Değiştir" - -#: ../vnc.html:142 -msgid "Send Tab" -msgstr "Sekme Gönder" - -#: ../vnc.html:142 -msgid "Tab" -msgstr "Sekme" - -#: ../vnc.html:145 -msgid "Esc" -msgstr "Esc" - -#: ../vnc.html:145 -msgid "Send Escape" -msgstr "Boşluk Gönder" - -#: ../vnc.html:148 -msgid "Ctrl+Alt+Del" -msgstr "Ctrl + Alt + Del" - -#: ../vnc.html:148 -msgid "Send Ctrl-Alt-Del" -msgstr "Ctrl-Alt-Del Gönder" - -#: ../vnc.html:156 -msgid "Shutdown/Reboot" -msgstr "Kapat/Yeniden Başlat" - -#: ../vnc.html:156 -msgid "Shutdown/Reboot..." -msgstr "Kapat/Yeniden Başlat..." - -#: ../vnc.html:162 -msgid "Power" -msgstr "Güç" - -#: ../vnc.html:164 -msgid "Shutdown" -msgstr "Kapat" - -#: ../vnc.html:165 -msgid "Reboot" -msgstr "Yeniden Başlat" - -#: ../vnc.html:166 -msgid "Reset" -msgstr "Sıfırla" - -#: ../vnc.html:171 ../vnc.html:177 -msgid "Clipboard" -msgstr "Pano" - -#: ../vnc.html:181 -msgid "Clear" -msgstr "Temizle" - -#: ../vnc.html:187 -msgid "Fullscreen" -msgstr "Tam Ekran" - -#: ../vnc.html:192 ../vnc.html:199 -msgid "Settings" -msgstr "Ayarlar" - -#: ../vnc.html:202 -msgid "Shared Mode" -msgstr "Paylaşım Modu" - -#: ../vnc.html:205 -msgid "View Only" -msgstr "Sadece Görüntüle" - -#: ../vnc.html:209 -msgid "Clip to Window" -msgstr "Pencereye Tıkla" - -#: ../vnc.html:212 -msgid "Scaling Mode:" -msgstr "Ölçekleme Modu:" - -#: ../vnc.html:214 -msgid "None" -msgstr "Bilinmeyen" - -#: ../vnc.html:215 -msgid "Local Scaling" -msgstr "Yerel Ölçeklendirme" - -#: ../vnc.html:216 -msgid "Remote Resizing" -msgstr "Uzaktan Yeniden Boyutlandırma" - -#: ../vnc.html:221 -msgid "Advanced" -msgstr "Gelişmiş" - -#: ../vnc.html:224 -msgid "Repeater ID:" -msgstr "Tekralayıcı ID:" - -#: ../vnc.html:228 -msgid "WebSocket" -msgstr "WebSocket" - -#: ../vnc.html:231 -msgid "Encrypt" -msgstr "Şifrele" - -#: ../vnc.html:234 -msgid "Host:" -msgstr "Ana makine:" - -#: ../vnc.html:238 -msgid "Port:" -msgstr "Port:" - -#: ../vnc.html:242 -msgid "Path:" -msgstr "Yol:" - -#: ../vnc.html:249 -msgid "Automatic Reconnect" -msgstr "Otomatik Yeniden Bağlan" - -#: ../vnc.html:252 -msgid "Reconnect Delay (ms):" -msgstr "Yeniden Bağlanma Süreci (ms):" - -#: ../vnc.html:258 -msgid "Logging:" -msgstr "Giriş yapılıyor:" - -#: ../vnc.html:270 -msgid "Disconnect" -msgstr "Bağlantıyı Kes" - -#: ../vnc.html:289 -msgid "Connect" -msgstr "Bağlan" - -#: ../vnc.html:299 -msgid "Password:" -msgstr "Parola:" - -#: ../vnc.html:313 -msgid "Cancel" -msgstr "Vazgeç" - -#: ../vnc.html:329 -msgid "Canvas not supported." -msgstr "Tuval desteklenmiyor." diff --git a/systemvm/agent/noVNC/po/xgettext-html b/systemvm/agent/noVNC/po/xgettext-html deleted file mode 100755 index 547f5687698c..000000000000 --- a/systemvm/agent/noVNC/po/xgettext-html +++ /dev/null @@ -1,115 +0,0 @@ -#!/usr/bin/env node -/* - * xgettext-html: HTML gettext parser - * Copyright (C) 2018 The noVNC Authors - * Licensed under MPL 2.0 (see LICENSE.txt) - */ - -const getopt = require('node-getopt'); -const jsdom = require("jsdom"); -const fs = require("fs"); - -const opt = getopt.create([ - ['o' , 'output=FILE' , 'write output to specified file'], - ['h' , 'help' , 'display this help'], -]).bindHelp().parseSystem(); - -const strings = {}; - -function addString(str, location) { - if (str.length == 0) { - return; - } - - if (strings[str] === undefined) { - strings[str] = {} - } - strings[str][location] = null; -} - -// See https://html.spec.whatwg.org/multipage/dom.html#attr-translate -function process(elem, locator, enabled) { - function isAnyOf(searchElement, items) { - return items.indexOf(searchElement) !== -1; - } - - if (elem.hasAttribute("translate")) { - if (isAnyOf(elem.getAttribute("translate"), ["", "yes"])) { - enabled = true; - } else if (isAnyOf(elem.getAttribute("translate"), ["no"])) { - enabled = false; - } - } - - if (enabled) { - if (elem.hasAttribute("abbr") && - elem.tagName === "TH") { - addString(elem.getAttribute("abbr"), locator(elem)); - } - if (elem.hasAttribute("alt") && - isAnyOf(elem.tagName, ["AREA", "IMG", "INPUT"])) { - addString(elem.getAttribute("alt"), locator(elem)); - } - if (elem.hasAttribute("download") && - isAnyOf(elem.tagName, ["A", "AREA"])) { - addString(elem.getAttribute("download"), locator(elem)); - } - if (elem.hasAttribute("label") && - isAnyOf(elem.tagName, ["MENUITEM", "MENU", "OPTGROUP", - "OPTION", "TRACK"])) { - addString(elem.getAttribute("label"), locator(elem)); - } - if (elem.hasAttribute("placeholder") && - isAnyOf(elem.tagName in ["INPUT", "TEXTAREA"])) { - addString(elem.getAttribute("placeholder"), locator(elem)); - } - if (elem.hasAttribute("title")) { - addString(elem.getAttribute("title"), locator(elem)); - } - if (elem.hasAttribute("value") && - elem.tagName === "INPUT" && - isAnyOf(elem.getAttribute("type"), ["reset", "button", "submit"])) { - addString(elem.getAttribute("value"), locator(elem)); - } - } - - for (let i = 0; i < elem.childNodes.length; i++) { - node = elem.childNodes[i]; - if (node.nodeType === node.ELEMENT_NODE) { - process(node, locator, enabled); - } else if (node.nodeType === node.TEXT_NODE && enabled) { - addString(node.data.trim(), locator(node)); - } - } -} - -for (let i = 0; i < opt.argv.length; i++) { - const fn = opt.argv[i]; - const file = fs.readFileSync(fn, "utf8"); - const dom = new jsdom.JSDOM(file, { includeNodeLocations: true }); - const body = dom.window.document.body; - - function locator(elem) { - const offset = dom.nodeLocation(elem).startOffset; - const line = file.slice(0, offset).split("\n").length; - return fn + ":" + line; - } - - process(body, locator, true); -} - -let output = ""; - -for (str in strings) { - output += "#:"; - for (location in strings[str]) { - output += " " + location; - } - output += "\n"; - - output += "msgid " + JSON.stringify(str) + "\n"; - output += "msgstr \"\"\n"; - output += "\n"; -} - -fs.writeFileSync(opt.options.output, output); diff --git a/systemvm/agent/noVNC/po/zh_CN.po b/systemvm/agent/noVNC/po/zh_CN.po deleted file mode 100644 index 78bfb958d5d1..000000000000 --- a/systemvm/agent/noVNC/po/zh_CN.po +++ /dev/null @@ -1,284 +0,0 @@ -# Simplified Chinese translations for noVNC package. -# Copyright (C) 2018 The noVNC Authors -# This file is distributed under the same license as the noVNC package. -# Peter Dave Hello , 2018. -# -msgid "" -msgstr "" -"Project-Id-Version: noVNC 1.0.0-testing.2\n" -"Report-Msgid-Bugs-To: novnc@googlegroups.com\n" -"POT-Creation-Date: 2018-01-10 00:53+0800\n" -"PO-Revision-Date: 2018-04-06 21:33+0800\n" -"Last-Translator: CUI Wei \n" -"Language: zh_CN\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../app/ui.js:395 -msgid "Connecting..." -msgstr "链接中..." - -#: ../app/ui.js:402 -msgid "Disconnecting..." -msgstr "正在中断连接..." - -#: ../app/ui.js:408 -msgid "Reconnecting..." -msgstr "重新链接中..." - -#: ../app/ui.js:413 -msgid "Internal error" -msgstr "内部错误" - -#: ../app/ui.js:1015 -msgid "Must set host" -msgstr "请提供主机名" - -#: ../app/ui.js:1097 -msgid "Connected (encrypted) to " -msgstr "已加密链接到" - -#: ../app/ui.js:1099 -msgid "Connected (unencrypted) to " -msgstr "未加密链接到" - -#: ../app/ui.js:1120 -msgid "Something went wrong, connection is closed" -msgstr "发生错误，链接已关闭" - -#: ../app/ui.js:1123 -msgid "Failed to connect to server" -msgstr "无法链接到服务器" - -#: ../app/ui.js:1133 -msgid "Disconnected" -msgstr "链接已中断" - -#: ../app/ui.js:1146 -msgid "New connection has been rejected with reason: " -msgstr "链接被拒绝，原因：" - -#: ../app/ui.js:1149 -msgid "New connection has been rejected" -msgstr "链接被拒绝" - -#: ../app/ui.js:1170 -msgid "Password is required" -msgstr "请提供密码" - -#: ../vnc.html:89 -msgid "noVNC encountered an error:" -msgstr "noVNC 遇到一个错误：" - -#: ../vnc.html:99 -msgid "Hide/Show the control bar" -msgstr "显示/隐藏控制列" - -#: ../vnc.html:106 -msgid "Move/Drag Viewport" -msgstr "拖放显示范围" - -#: ../vnc.html:106 -msgid "viewport drag" -msgstr "显示范围拖放" - -#: ../vnc.html:112 ../vnc.html:115 ../vnc.html:118 ../vnc.html:121 -msgid "Active Mouse Button" -msgstr "启动鼠标按鍵" - -#: ../vnc.html:112 -msgid "No mousebutton" -msgstr "禁用鼠标按鍵" - -#: ../vnc.html:115 -msgid "Left mousebutton" -msgstr "鼠标左鍵" - -#: ../vnc.html:118 -msgid "Middle mousebutton" -msgstr "鼠标中鍵" - -#: ../vnc.html:121 -msgid "Right mousebutton" -msgstr "鼠标右鍵" - -#: ../vnc.html:124 -msgid "Keyboard" -msgstr "键盘" - -#: ../vnc.html:124 -msgid "Show Keyboard" -msgstr "显示键盘" - -#: ../vnc.html:131 -msgid "Extra keys" -msgstr "额外按键" - -#: ../vnc.html:131 -msgid "Show Extra Keys" -msgstr "显示额外按键" - -#: ../vnc.html:136 -msgid "Ctrl" -msgstr "Ctrl" - -#: ../vnc.html:136 -msgid "Toggle Ctrl" -msgstr "切换 Ctrl" - -#: ../vnc.html:139 -msgid "Alt" -msgstr "Alt" - -#: ../vnc.html:139 -msgid "Toggle Alt" -msgstr "切换 Alt" - -#: ../vnc.html:142 -msgid "Send Tab" -msgstr "发送 Tab 键" - -#: ../vnc.html:142 -msgid "Tab" -msgstr "Tab" - -#: ../vnc.html:145 -msgid "Esc" -msgstr "Esc" - -#: ../vnc.html:145 -msgid "Send Escape" -msgstr "发送 Escape 键" - -#: ../vnc.html:148 -msgid "Ctrl+Alt+Del" -msgstr "Ctrl-Alt-Del" - -#: ../vnc.html:148 -msgid "Send Ctrl-Alt-Del" -msgstr "发送 Ctrl-Alt-Del 键" - -#: ../vnc.html:156 -msgid "Shutdown/Reboot" -msgstr "关机/重新启动" - -#: ../vnc.html:156 -msgid "Shutdown/Reboot..." -msgstr "关机/重新启动..." - -#: ../vnc.html:162 -msgid "Power" -msgstr "电源" - -#: ../vnc.html:164 -msgid "Shutdown" -msgstr "关机" - -#: ../vnc.html:165 -msgid "Reboot" -msgstr "重新启动" - -#: ../vnc.html:166 -msgid "Reset" -msgstr "重置" - -#: ../vnc.html:171 ../vnc.html:177 -msgid "Clipboard" -msgstr "剪贴板" - -#: ../vnc.html:181 -msgid "Clear" -msgstr "清除" - -#: ../vnc.html:187 -msgid "Fullscreen" -msgstr "全屏幕" - -#: ../vnc.html:192 ../vnc.html:199 -msgid "Settings" -msgstr "设置" - -#: ../vnc.html:202 -msgid "Shared Mode" -msgstr "分享模式" - -#: ../vnc.html:205 -msgid "View Only" -msgstr "仅检视" - -#: ../vnc.html:209 -msgid "Clip to Window" -msgstr "限制/裁切窗口大小" - -#: ../vnc.html:212 -msgid "Scaling Mode:" -msgstr "缩放模式：" - -#: ../vnc.html:214 -msgid "None" -msgstr "无" - -#: ../vnc.html:215 -msgid "Local Scaling" -msgstr "本地缩放" - -#: ../vnc.html:216 -msgid "Remote Resizing" -msgstr "远程调整大小" - -#: ../vnc.html:221 -msgid "Advanced" -msgstr "高级" - -#: ../vnc.html:224 -msgid "Repeater ID:" -msgstr "中继站 ID" - -#: ../vnc.html:228 -msgid "WebSocket" -msgstr "WebSocket" - -#: ../vnc.html:231 -msgid "Encrypt" -msgstr "加密" - -#: ../vnc.html:234 -msgid "Host:" -msgstr "主机：" - -#: ../vnc.html:238 -msgid "Port:" -msgstr "端口：" - -#: ../vnc.html:242 -msgid "Path:" -msgstr "路径：" - -#: ../vnc.html:249 -msgid "Automatic Reconnect" -msgstr "自动重新链接" - -#: ../vnc.html:252 -msgid "Reconnect Delay (ms):" -msgstr "重新链接间隔 (ms)：" - -#: ../vnc.html:258 -msgid "Logging:" -msgstr "日志级别：" - -#: ../vnc.html:270 -msgid "Disconnect" -msgstr "终端链接" - -#: ../vnc.html:289 -msgid "Connect" -msgstr "链接" - -#: ../vnc.html:299 -msgid "Password:" -msgstr "密码：" - -#: ../vnc.html:313 -msgid "Cancel" -msgstr "取消" diff --git a/systemvm/agent/noVNC/po/zh_TW.po b/systemvm/agent/noVNC/po/zh_TW.po deleted file mode 100644 index 9ddf550c1d2d..000000000000 --- a/systemvm/agent/noVNC/po/zh_TW.po +++ /dev/null @@ -1,285 +0,0 @@ -# Traditional Chinese translations for noVNC package. -# Copyright (C) 2018 The noVNC Authors -# This file is distributed under the same license as the noVNC package. -# Peter Dave Hello , 2018. -# -msgid "" -msgstr "" -"Project-Id-Version: noVNC 1.0.0-testing.2\n" -"Report-Msgid-Bugs-To: novnc@googlegroups.com\n" -"POT-Creation-Date: 2018-01-10 00:53+0800\n" -"PO-Revision-Date: 2018-01-10 01:33+0800\n" -"Last-Translator: Peter Dave Hello \n" -"Language-Team: Peter Dave Hello \n" -"Language: zh\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: ../app/ui.js:395 -msgid "Connecting..." -msgstr "連線中..." - -#: ../app/ui.js:402 -msgid "Disconnecting..." -msgstr "正在中斷連線..." - -#: ../app/ui.js:408 -msgid "Reconnecting..." -msgstr "重新連線中..." - -#: ../app/ui.js:413 -msgid "Internal error" -msgstr "內部錯誤" - -#: ../app/ui.js:1015 -msgid "Must set host" -msgstr "請提供主機資訊" - -#: ../app/ui.js:1097 -msgid "Connected (encrypted) to " -msgstr "已加密連線到" - -#: ../app/ui.js:1099 -msgid "Connected (unencrypted) to " -msgstr "未加密連線到" - -#: ../app/ui.js:1120 -msgid "Something went wrong, connection is closed" -msgstr "發生錯誤，連線已關閉" - -#: ../app/ui.js:1123 -msgid "Failed to connect to server" -msgstr "無法連線到伺服器" - -#: ../app/ui.js:1133 -msgid "Disconnected" -msgstr "連線已中斷" - -#: ../app/ui.js:1146 -msgid "New connection has been rejected with reason: " -msgstr "連線被拒絕，原因：" - -#: ../app/ui.js:1149 -msgid "New connection has been rejected" -msgstr "連線被拒絕" - -#: ../app/ui.js:1170 -msgid "Password is required" -msgstr "請提供密碼" - -#: ../vnc.html:89 -msgid "noVNC encountered an error:" -msgstr "noVNC 遇到一個錯誤：" - -#: ../vnc.html:99 -msgid "Hide/Show the control bar" -msgstr "顯示/隱藏控制列" - -#: ../vnc.html:106 -msgid "Move/Drag Viewport" -msgstr "拖放顯示範圍" - -#: ../vnc.html:106 -msgid "viewport drag" -msgstr "顯示範圍拖放" - -#: ../vnc.html:112 ../vnc.html:115 ../vnc.html:118 ../vnc.html:121 -msgid "Active Mouse Button" -msgstr "啟用滑鼠按鍵" - -#: ../vnc.html:112 -msgid "No mousebutton" -msgstr "無滑鼠按鍵" - -#: ../vnc.html:115 -msgid "Left mousebutton" -msgstr "滑鼠左鍵" - -#: ../vnc.html:118 -msgid "Middle mousebutton" -msgstr "滑鼠中鍵" - -#: ../vnc.html:121 -msgid "Right mousebutton" -msgstr "滑鼠右鍵" - -#: ../vnc.html:124 -msgid "Keyboard" -msgstr "鍵盤" - -#: ../vnc.html:124 -msgid "Show Keyboard" -msgstr "顯示鍵盤" - -#: ../vnc.html:131 -msgid "Extra keys" -msgstr "額外按鍵" - -#: ../vnc.html:131 -msgid "Show Extra Keys" -msgstr "顯示額外按鍵" - -#: ../vnc.html:136 -msgid "Ctrl" -msgstr "Ctrl" - -#: ../vnc.html:136 -msgid "Toggle Ctrl" -msgstr "切換 Ctrl" - -#: ../vnc.html:139 -msgid "Alt" -msgstr "Alt" - -#: ../vnc.html:139 -msgid "Toggle Alt" -msgstr "切換 Alt" - -#: ../vnc.html:142 -msgid "Send Tab" -msgstr "送出 Tab 鍵" - -#: ../vnc.html:142 -msgid "Tab" -msgstr "Tab" - -#: ../vnc.html:145 -msgid "Esc" -msgstr "Esc" - -#: ../vnc.html:145 -msgid "Send Escape" -msgstr "送出 Escape 鍵" - -#: ../vnc.html:148 -msgid "Ctrl+Alt+Del" -msgstr "Ctrl-Alt-Del" - -#: ../vnc.html:148 -msgid "Send Ctrl-Alt-Del" -msgstr "送出 Ctrl-Alt-Del 快捷鍵" - -#: ../vnc.html:156 -msgid "Shutdown/Reboot" -msgstr "關機/重新啟動" - -#: ../vnc.html:156 -msgid "Shutdown/Reboot..." -msgstr "關機/重新啟動..." - -#: ../vnc.html:162 -msgid "Power" -msgstr "電源" - -#: ../vnc.html:164 -msgid "Shutdown" -msgstr "關機" - -#: ../vnc.html:165 -msgid "Reboot" -msgstr "重新啟動" - -#: ../vnc.html:166 -msgid "Reset" -msgstr "重設" - -#: ../vnc.html:171 ../vnc.html:177 -msgid "Clipboard" -msgstr "剪貼簿" - -#: ../vnc.html:181 -msgid "Clear" -msgstr "清除" - -#: ../vnc.html:187 -msgid "Fullscreen" -msgstr "全螢幕" - -#: ../vnc.html:192 ../vnc.html:199 -msgid "Settings" -msgstr "設定" - -#: ../vnc.html:202 -msgid "Shared Mode" -msgstr "分享模式" - -#: ../vnc.html:205 -msgid "View Only" -msgstr "僅檢視" - -#: ../vnc.html:209 -msgid "Clip to Window" -msgstr "限制/裁切視窗大小" - -#: ../vnc.html:212 -msgid "Scaling Mode:" -msgstr "縮放模式：" - -#: ../vnc.html:214 -msgid "None" -msgstr "無" - -#: ../vnc.html:215 -msgid "Local Scaling" -msgstr "本機縮放" - -#: ../vnc.html:216 -msgid "Remote Resizing" -msgstr "遠端調整大小" - -#: ../vnc.html:221 -msgid "Advanced" -msgstr "進階" - -#: ../vnc.html:224 -msgid "Repeater ID:" -msgstr "中繼站 ID" - -#: ../vnc.html:228 -msgid "WebSocket" -msgstr "WebSocket" - -#: ../vnc.html:231 -msgid "Encrypt" -msgstr "加密" - -#: ../vnc.html:234 -msgid "Host:" -msgstr "主機：" - -#: ../vnc.html:238 -msgid "Port:" -msgstr "連接埠：" - -#: ../vnc.html:242 -msgid "Path:" -msgstr "路徑：" - -#: ../vnc.html:249 -msgid "Automatic Reconnect" -msgstr "自動重新連線" - -#: ../vnc.html:252 -msgid "Reconnect Delay (ms):" -msgstr "重新連線間隔 (ms)：" - -#: ../vnc.html:258 -msgid "Logging:" -msgstr "日誌級別：" - -#: ../vnc.html:270 -msgid "Disconnect" -msgstr "中斷連線" - -#: ../vnc.html:289 -msgid "Connect" -msgstr "連線" - -#: ../vnc.html:299 -msgid "Password:" -msgstr "密碼：" - -#: ../vnc.html:313 -msgid "Cancel" -msgstr "取消" diff --git a/systemvm/agent/noVNC/tests/.eslintrc b/systemvm/agent/noVNC/tests/.eslintrc deleted file mode 100644 index 545fa2ed25ed..000000000000 --- a/systemvm/agent/noVNC/tests/.eslintrc +++ /dev/null @@ -1,15 +0,0 @@ -{ - "env": { - "node": true, - "mocha": true - }, - "globals": { - "chai": false, - "sinon": false - }, - "rules": { - "prefer-arrow-callback": 0, - // Too many anonymous callbacks - "func-names": "off", - } -} diff --git a/systemvm/agent/noVNC/tests/assertions.js b/systemvm/agent/noVNC/tests/assertions.js deleted file mode 100644 index 07a5c2977686..000000000000 --- a/systemvm/agent/noVNC/tests/assertions.js +++ /dev/null @@ -1,101 +0,0 @@ -// noVNC specific assertions -chai.use(function (_chai, utils) { - _chai.Assertion.addMethod('displayed', function (target_data) { - const obj = this._obj; - const ctx = obj._target.getContext('2d'); - const data_cl = ctx.getImageData(0, 0, obj._target.width, obj._target.height).data; - // NB(directxman12): PhantomJS 1.x doesn't implement Uint8ClampedArray, so work around that - const data = new Uint8Array(data_cl); - const len = data_cl.length; - new chai.Assertion(len).to.be.equal(target_data.length, "unexpected display size"); - let same = true; - for (let i = 0; i < len; i++) { - if (data[i] != target_data[i]) { - same = false; - break; - } - } - if (!same) { - // eslint-disable-next-line no-console - console.log("expected data: %o, actual data: %o", target_data, data); - } - this.assert(same, - "expected #{this} to have displayed the image #{exp}, but instead it displayed #{act}", - "expected #{this} not to have displayed the image #{act}", - target_data, - data); - }); - - _chai.Assertion.addMethod('sent', function (target_data) { - const obj = this._obj; - obj.inspect = () => { - const res = { _websocket: obj._websocket, rQi: obj._rQi, _rQ: new Uint8Array(obj._rQ.buffer, 0, obj._rQlen), - _sQ: new Uint8Array(obj._sQ.buffer, 0, obj._sQlen) }; - res.prototype = obj; - return res; - }; - const data = obj._websocket._get_sent_data(); - let same = true; - if (data.length != target_data.length) { - same = false; - } else { - for (let i = 0; i < data.length; i++) { - if (data[i] != target_data[i]) { - same = false; - break; - } - } - } - if (!same) { - // eslint-disable-next-line no-console - console.log("expected data: %o, actual data: %o", target_data, data); - } - this.assert(same, - "expected #{this} to have sent the data #{exp}, but it actually sent #{act}", - "expected #{this} not to have sent the data #{act}", - Array.prototype.slice.call(target_data), - Array.prototype.slice.call(data)); - }); - - _chai.Assertion.addProperty('array', function () { - utils.flag(this, 'array', true); - }); - - _chai.Assertion.overwriteMethod('equal', function (_super) { - return function assertArrayEqual(target) { - if (utils.flag(this, 'array')) { - const obj = this._obj; - - let same = true; - - if (utils.flag(this, 'deep')) { - for (let i = 0; i < obj.length; i++) { - if (!utils.eql(obj[i], target[i])) { - same = false; - break; - } - } - - this.assert(same, - "expected #{this} to have elements deeply equal to #{exp}", - "expected #{this} not to have elements deeply equal to #{exp}", - Array.prototype.slice.call(target)); - } else { - for (let i = 0; i < obj.length; i++) { - if (obj[i] != target[i]) { - same = false; - break; - } - } - - this.assert(same, - "expected #{this} to have elements equal to #{exp}", - "expected #{this} not to have elements equal to #{exp}", - Array.prototype.slice.call(target)); - } - } else { - _super.apply(this, arguments); - } - }; - }); -}); diff --git a/systemvm/agent/noVNC/tests/fake.websocket.js b/systemvm/agent/noVNC/tests/fake.websocket.js deleted file mode 100644 index 68ab3f8487d4..000000000000 --- a/systemvm/agent/noVNC/tests/fake.websocket.js +++ /dev/null @@ -1,96 +0,0 @@ -import Base64 from '../core/base64.js'; - -// PhantomJS can't create Event objects directly, so we need to use this -function make_event(name, props) { - const evt = document.createEvent('Event'); - evt.initEvent(name, true, true); - if (props) { - for (let prop in props) { - evt[prop] = props[prop]; - } - } - return evt; -} - -export default class FakeWebSocket { - constructor(uri, protocols) { - this.url = uri; - this.binaryType = "arraybuffer"; - this.extensions = ""; - - if (!protocols || typeof protocols === 'string') { - this.protocol = protocols; - } else { - this.protocol = protocols[0]; - } - - this._send_queue = new Uint8Array(20000); - - this.readyState = FakeWebSocket.CONNECTING; - this.bufferedAmount = 0; - - this.__is_fake = true; - } - - close(code, reason) { - this.readyState = FakeWebSocket.CLOSED; - if (this.onclose) { - this.onclose(make_event("close", { 'code': code, 'reason': reason, 'wasClean': true })); - } - } - - send(data) { - if (this.protocol == 'base64') { - data = Base64.decode(data); - } else { - data = new Uint8Array(data); - } - this._send_queue.set(data, this.bufferedAmount); - this.bufferedAmount += data.length; - } - - _get_sent_data() { - const res = new Uint8Array(this._send_queue.buffer, 0, this.bufferedAmount); - this.bufferedAmount = 0; - return res; - } - - _open() { - this.readyState = FakeWebSocket.OPEN; - if (this.onopen) { - this.onopen(make_event('open')); - } - } - - _receive_data(data) { - // Break apart the data to expose bugs where we assume data is - // neatly packaged - for (let i = 0;i < data.length;i++) { - let buf = data.subarray(i, i+1); - this.onmessage(make_event("message", { 'data': buf })); - } - } -} - -FakeWebSocket.OPEN = WebSocket.OPEN; -FakeWebSocket.CONNECTING = WebSocket.CONNECTING; -FakeWebSocket.CLOSING = WebSocket.CLOSING; -FakeWebSocket.CLOSED = WebSocket.CLOSED; - -FakeWebSocket.__is_fake = true; - -FakeWebSocket.replace = () => { - if (!WebSocket.__is_fake) { - const real_version = WebSocket; - // eslint-disable-next-line no-global-assign - WebSocket = FakeWebSocket; - FakeWebSocket.__real_version = real_version; - } -}; - -FakeWebSocket.restore = () => { - if (WebSocket.__is_fake) { - // eslint-disable-next-line no-global-assign - WebSocket = WebSocket.__real_version; - } -}; diff --git a/systemvm/agent/noVNC/tests/karma-test-main.js b/systemvm/agent/noVNC/tests/karma-test-main.js deleted file mode 100644 index 28436667e6d1..000000000000 --- a/systemvm/agent/noVNC/tests/karma-test-main.js +++ /dev/null @@ -1,48 +0,0 @@ -const TEST_REGEXP = /test\..*\.js/; -const allTestFiles = []; -const extraFiles = ['/base/tests/assertions.js']; - -Object.keys(window.__karma__.files).forEach(function (file) { - if (TEST_REGEXP.test(file)) { - // TODO: normalize? - allTestFiles.push(file); - } -}); - -// Stub out mocha's start function so we can run it once we're done loading -mocha.origRun = mocha.run; -mocha.run = function () {}; - -let script; - -// Script to import all our tests -script = document.createElement("script"); -script.type = "module"; -script.text = ""; -let allModules = allTestFiles.concat(extraFiles); -allModules.forEach(function (file) { - script.text += "import \"" + file + "\";\n"; -}); -script.text += "\nmocha.origRun();\n"; -document.body.appendChild(script); - -// Fallback code for browsers that don't support modules (IE) -script = document.createElement("script"); -script.type = "module"; -script.text = "window._noVNC_has_module_support = true;\n"; -document.body.appendChild(script); - -function fallback() { - if (!window._noVNC_has_module_support) { - /* eslint-disable no-console */ - if (console) { - console.log("No module support detected. Loading fallback..."); - } - /* eslint-enable no-console */ - let loader = document.createElement("script"); - loader.src = "base/vendor/browser-es-module-loader/dist/browser-es-module-loader.js"; - document.body.appendChild(loader); - } -} - -setTimeout(fallback, 500); diff --git a/systemvm/agent/noVNC/tests/playback-ui.js b/systemvm/agent/noVNC/tests/playback-ui.js deleted file mode 100644 index 65c715a9fe55..000000000000 --- a/systemvm/agent/noVNC/tests/playback-ui.js +++ /dev/null @@ -1,210 +0,0 @@ -/* global VNC_frame_data, VNC_frame_encoding */ - -import * as WebUtil from '../app/webutil.js'; -import RecordingPlayer from './playback.js'; -import Base64 from '../core/base64.js'; - -let frames = null; - -function message(str) { - const cell = document.getElementById('messages'); - cell.textContent += str + "\n"; - cell.scrollTop = cell.scrollHeight; -} - -function loadFile() { - const fname = WebUtil.getQueryVar('data', null); - - if (!fname) { - return Promise.reject("Must specify data=FOO in query string."); - } - - message("Loading " + fname + "..."); - - return new Promise((resolve, reject) => { - const script = document.createElement("script"); - script.onload = resolve; - script.onerror = reject; - document.body.appendChild(script); - script.src = "../recordings/" + fname; - }); -} - -function enableUI() { - const iterations = WebUtil.getQueryVar('iterations', 3); - document.getElementById('iterations').value = iterations; - - const mode = WebUtil.getQueryVar('mode', 3); - if (mode === 'realtime') { - document.getElementById('mode2').checked = true; - } else { - document.getElementById('mode1').checked = true; - } - - message("Loaded " + VNC_frame_data.length + " frames"); - - const startButton = document.getElementById('startButton'); - startButton.disabled = false; - startButton.addEventListener('click', start); - - message("Converting..."); - - frames = VNC_frame_data; - - let encoding; - // Only present in older recordings - if (window.VNC_frame_encoding) { - encoding = VNC_frame_encoding; - } else { - let frame = frames[0]; - let start = frame.indexOf('{', 1) + 1; - if (frame.slice(start, start+4) === 'UkZC') { - encoding = 'base64'; - } else { - encoding = 'binary'; - } - } - - for (let i = 0;i < frames.length;i++) { - let frame = frames[i]; - - if (frame === "EOF") { - frames.splice(i); - break; - } - - let dataIdx = frame.indexOf('{', 1) + 1; - - let time = parseInt(frame.slice(1, dataIdx - 1)); - - let u8; - if (encoding === 'base64') { - u8 = Base64.decode(frame.slice(dataIdx)); - } else { - u8 = new Uint8Array(frame.length - dataIdx); - for (let j = 0; j < frame.length - dataIdx; j++) { - u8[j] = frame.charCodeAt(dataIdx + j); - } - } - - frames[i] = { fromClient: frame[0] === '}', - timestamp: time, - data: u8 }; - } - - message("Ready"); -} - -class IterationPlayer { - constructor(iterations, frames) { - this._iterations = iterations; - - this._iteration = undefined; - this._player = undefined; - - this._start_time = undefined; - - this._frames = frames; - - this._state = 'running'; - - this.onfinish = () => {}; - this.oniterationfinish = () => {}; - this.rfbdisconnected = () => {}; - } - - start(realtime) { - this._iteration = 0; - this._start_time = (new Date()).getTime(); - - this._realtime = realtime; - - this._nextIteration(); - } - - _nextIteration() { - const player = new RecordingPlayer(this._frames, this._disconnected.bind(this)); - player.onfinish = this._iterationFinish.bind(this); - - if (this._state !== 'running') { return; } - - this._iteration++; - if (this._iteration > this._iterations) { - this._finish(); - return; - } - - player.run(this._realtime, false); - } - - _finish() { - const endTime = (new Date()).getTime(); - const totalDuration = endTime - this._start_time; - - const evt = new CustomEvent('finish', - { detail: - { duration: totalDuration, - iterations: this._iterations } } ); - this.onfinish(evt); - } - - _iterationFinish(duration) { - const evt = new CustomEvent('iterationfinish', - { detail: - { duration: duration, - number: this._iteration } } ); - this.oniterationfinish(evt); - - this._nextIteration(); - } - - _disconnected(clean, frame) { - if (!clean) { - this._state = 'failed'; - } - - const evt = new CustomEvent('rfbdisconnected', - { detail: - { clean: clean, - frame: frame, - iteration: this._iteration } } ); - this.onrfbdisconnected(evt); - } -} - -function start() { - document.getElementById('startButton').value = "Running"; - document.getElementById('startButton').disabled = true; - - const iterations = document.getElementById('iterations').value; - - let realtime; - - if (document.getElementById('mode1').checked) { - message(`Starting performance playback (fullspeed) [${iterations} iteration(s)]`); - realtime = false; - } else { - message(`Starting realtime playback [${iterations} iteration(s)]`); - realtime = true; - } - - const player = new IterationPlayer(iterations, frames); - player.oniterationfinish = (evt) => { - message(`Iteration ${evt.detail.number} took ${evt.detail.duration}ms`); - }; - player.onrfbdisconnected = (evt) => { - if (!evt.detail.clean) { - message(`noVNC sent disconnected during iteration ${evt.detail.iteration} frame ${evt.detail.frame}`); - } - }; - player.onfinish = (evt) => { - const iterTime = parseInt(evt.detail.duration / evt.detail.iterations, 10); - message(`${evt.detail.iterations} iterations took ${evt.detail.duration}ms (average ${iterTime}ms / iteration)`); - - document.getElementById('startButton').disabled = false; - document.getElementById('startButton').value = "Start"; - }; - player.start(realtime); -} - -loadFile().then(enableUI).catch(e => message("Error loading recording: " + e)); diff --git a/systemvm/agent/noVNC/tests/playback.js b/systemvm/agent/noVNC/tests/playback.js deleted file mode 100644 index 5bd8103a840e..000000000000 --- a/systemvm/agent/noVNC/tests/playback.js +++ /dev/null @@ -1,172 +0,0 @@ -/* - * noVNC: HTML5 VNC client - * Copyright (C) 2018 The noVNC Authors - * Licensed under MPL 2.0 (see LICENSE.txt) - */ - -import RFB from '../core/rfb.js'; -import * as Log from '../core/util/logging.js'; - -// Immediate polyfill -if (window.setImmediate === undefined) { - let _immediateIdCounter = 1; - const _immediateFuncs = {}; - - window.setImmediate = (func) => { - const index = _immediateIdCounter++; - _immediateFuncs[index] = func; - window.postMessage("noVNC immediate trigger:" + index, "*"); - return index; - }; - - window.clearImmediate = (id) => { - _immediateFuncs[id]; - }; - - window.addEventListener("message", (event) => { - if ((typeof event.data !== "string") || - (event.data.indexOf("noVNC immediate trigger:") !== 0)) { - return; - } - - const index = event.data.slice("noVNC immediate trigger:".length); - - const callback = _immediateFuncs[index]; - if (callback === undefined) { - return; - } - - delete _immediateFuncs[index]; - - callback(); - }); -} - -export default class RecordingPlayer { - constructor(frames, disconnected) { - this._frames = frames; - - this._disconnected = disconnected; - - this._rfb = undefined; - this._frame_length = this._frames.length; - - this._frame_index = 0; - this._start_time = undefined; - this._realtime = true; - this._trafficManagement = true; - - this._running = false; - - this.onfinish = () => {}; - } - - run(realtime, trafficManagement) { - // initialize a new RFB - this._rfb = new RFB(document.getElementById('VNC_screen'), 'wss://test'); - this._rfb.viewOnly = true; - this._rfb.addEventListener("disconnect", - this._handleDisconnect.bind(this)); - this._rfb.addEventListener("credentialsrequired", - this._handleCredentials.bind(this)); - this._enablePlaybackMode(); - - // reset the frame index and timer - this._frame_index = 0; - this._start_time = (new Date()).getTime(); - - this._realtime = realtime; - this._trafficManagement = (trafficManagement === undefined) ? !realtime : trafficManagement; - - this._running = true; - } - - // _enablePlaybackMode mocks out things not required for running playback - _enablePlaybackMode() { - const self = this; - this._rfb._sock.send = () => {}; - this._rfb._sock.close = () => {}; - this._rfb._sock.flush = () => {}; - this._rfb._sock.open = function () { - this.init(); - this._eventHandlers.open(); - self._queueNextPacket(); - }; - } - - _queueNextPacket() { - if (!this._running) { return; } - - let frame = this._frames[this._frame_index]; - - // skip send frames - while (this._frame_index < this._frame_length && frame.fromClient) { - this._frame_index++; - frame = this._frames[this._frame_index]; - } - - if (this._frame_index >= this._frame_length) { - Log.Debug('Finished, no more frames'); - this._finish(); - return; - } - - if (this._realtime) { - const toffset = (new Date()).getTime() - this._start_time; - let delay = frame.timestamp - toffset; - if (delay < 1) delay = 1; - - setTimeout(this._doPacket.bind(this), delay); - } else { - setImmediate(this._doPacket.bind(this)); - } - } - - _doPacket() { - // Avoid having excessive queue buildup in non-realtime mode - if (this._trafficManagement && this._rfb._flushing) { - const orig = this._rfb._display.onflush; - this._rfb._display.onflush = () => { - this._rfb._display.onflush = orig; - this._rfb._onFlush(); - this._doPacket(); - }; - return; - } - - const frame = this._frames[this._frame_index]; - - this._rfb._sock._recv_message({'data': frame.data}); - this._frame_index++; - - this._queueNextPacket(); - } - - _finish() { - if (this._rfb._display.pending()) { - this._rfb._display.onflush = () => { - if (this._rfb._flushing) { - this._rfb._onFlush(); - } - this._finish(); - }; - this._rfb._display.flush(); - } else { - this._running = false; - this._rfb._sock._eventHandlers.close({code: 1000, reason: ""}); - delete this._rfb; - this.onfinish((new Date()).getTime() - this._start_time); - } - } - - _handleDisconnect(evt) { - this._running = false; - this._disconnected(evt.detail.clean, this._frame_index); - } - - _handleCredentials(evt) { - this._rfb.sendCredentials({"username": "Foo", - "password": "Bar", - "target": "Baz"}); - } -} diff --git a/systemvm/agent/noVNC/tests/test.base64.js b/systemvm/agent/noVNC/tests/test.base64.js deleted file mode 100644 index 04bd207b7cf8..000000000000 --- a/systemvm/agent/noVNC/tests/test.base64.js +++ /dev/null @@ -1,33 +0,0 @@ -const expect = chai.expect; - -import Base64 from '../core/base64.js'; - -describe('Base64 Tools', function () { - "use strict"; - - const BIN_ARR = new Array(256); - for (let i = 0; i < 256; i++) { - BIN_ARR[i] = i; - } - - const B64_STR = "AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8gISIjJCUmJygpKissLS4vMDEyMzQ1Njc4OTo7PD0+P0BBQkNERUZHSElKS0xNTk9QUVJTVFVWV1hZWltcXV5fYGFiY2RlZmdoaWprbG1ub3BxcnN0dXZ3eHl6e3x9fn+AgYKDhIWGh4iJiouMjY6PkJGSk5SVlpeYmZqbnJ2en6ChoqOkpaanqKmqq6ytrq+wsbKztLW2t7i5uru8vb6/wMHCw8TFxsfIycrLzM3Oz9DR0tPU1dbX2Nna29zd3t/g4eLj5OXm5+jp6uvs7e7v8PHy8/T19vf4+fr7/P3+/w=="; - - - describe('encode', function () { - it('should encode a binary string into Base64', function () { - const encoded = Base64.encode(BIN_ARR); - expect(encoded).to.equal(B64_STR); - }); - }); - - describe('decode', function () { - it('should decode a Base64 string into a normal string', function () { - const decoded = Base64.decode(B64_STR); - expect(decoded).to.deep.equal(BIN_ARR); - }); - - it('should throw an error if we have extra characters at the end of the string', function () { - expect(() => Base64.decode(B64_STR+'abcdef')).to.throw(Error); - }); - }); -}); diff --git a/systemvm/agent/noVNC/tests/test.display.js b/systemvm/agent/noVNC/tests/test.display.js deleted file mode 100644 index b359550326de..000000000000 --- a/systemvm/agent/noVNC/tests/test.display.js +++ /dev/null @@ -1,486 +0,0 @@ -const expect = chai.expect; - -import Base64 from '../core/base64.js'; -import Display from '../core/display.js'; - -describe('Display/Canvas Helper', function () { - const checked_data = new Uint8Array([ - 0x00, 0x00, 0xff, 255, 0x00, 0x00, 0xff, 255, 0x00, 0xff, 0x00, 255, 0x00, 0xff, 0x00, 255, - 0x00, 0x00, 0xff, 255, 0x00, 0x00, 0xff, 255, 0x00, 0xff, 0x00, 255, 0x00, 0xff, 0x00, 255, - 0x00, 0xff, 0x00, 255, 0x00, 0xff, 0x00, 255, 0x00, 0x00, 0xff, 255, 0x00, 0x00, 0xff, 255, - 0x00, 0xff, 0x00, 255, 0x00, 0xff, 0x00, 255, 0x00, 0x00, 0xff, 255, 0x00, 0x00, 0xff, 255 - ]); - - const basic_data = new Uint8Array([0xff, 0x00, 0x00, 255, 0x00, 0xff, 0x00, 255, 0x00, 0x00, 0xff, 255, 0xff, 0xff, 0xff, 255]); - - function make_image_canvas(input_data) { - const canvas = document.createElement('canvas'); - canvas.width = 4; - canvas.height = 4; - const ctx = canvas.getContext('2d'); - const data = ctx.createImageData(4, 4); - for (let i = 0; i < checked_data.length; i++) { data.data[i] = input_data[i]; } - ctx.putImageData(data, 0, 0); - return canvas; - } - - function make_image_png(input_data) { - const canvas = make_image_canvas(input_data); - const url = canvas.toDataURL(); - const data = url.split(",")[1]; - return Base64.decode(data); - } - - describe('viewport handling', function () { - let display; - beforeEach(function () { - display = new Display(document.createElement('canvas')); - display.clipViewport = true; - display.resize(5, 5); - display.viewportChangeSize(3, 3); - display.viewportChangePos(1, 1); - }); - - it('should take viewport location into consideration when drawing images', function () { - display.resize(4, 4); - display.viewportChangeSize(2, 2); - display.drawImage(make_image_canvas(basic_data), 1, 1); - display.flip(); - - const expected = new Uint8Array(16); - for (let i = 0; i < 8; i++) { expected[i] = basic_data[i]; } - for (let i = 8; i < 16; i++) { expected[i] = 0; } - expect(display).to.have.displayed(expected); - }); - - it('should resize the target canvas when resizing the viewport', function () { - display.viewportChangeSize(2, 2); - expect(display._target.width).to.equal(2); - expect(display._target.height).to.equal(2); - }); - - it('should move the viewport if necessary', function () { - display.viewportChangeSize(5, 5); - expect(display.absX(0)).to.equal(0); - expect(display.absY(0)).to.equal(0); - expect(display._target.width).to.equal(5); - expect(display._target.height).to.equal(5); - }); - - it('should limit the viewport to the framebuffer size', function () { - display.viewportChangeSize(6, 6); - expect(display._target.width).to.equal(5); - expect(display._target.height).to.equal(5); - }); - - it('should redraw when moving the viewport', function () { - display.flip = sinon.spy(); - display.viewportChangePos(-1, 1); - expect(display.flip).to.have.been.calledOnce; - }); - - it('should redraw when resizing the viewport', function () { - display.flip = sinon.spy(); - display.viewportChangeSize(2, 2); - expect(display.flip).to.have.been.calledOnce; - }); - - it('should show the entire framebuffer when disabling the viewport', function () { - display.clipViewport = false; - expect(display.absX(0)).to.equal(0); - expect(display.absY(0)).to.equal(0); - expect(display._target.width).to.equal(5); - expect(display._target.height).to.equal(5); - }); - - it('should ignore viewport changes when the viewport is disabled', function () { - display.clipViewport = false; - display.viewportChangeSize(2, 2); - display.viewportChangePos(1, 1); - expect(display.absX(0)).to.equal(0); - expect(display.absY(0)).to.equal(0); - expect(display._target.width).to.equal(5); - expect(display._target.height).to.equal(5); - }); - - it('should show the entire framebuffer just after enabling the viewport', function () { - display.clipViewport = false; - display.clipViewport = true; - expect(display.absX(0)).to.equal(0); - expect(display.absY(0)).to.equal(0); - expect(display._target.width).to.equal(5); - expect(display._target.height).to.equal(5); - }); - }); - - describe('resizing', function () { - let display; - beforeEach(function () { - display = new Display(document.createElement('canvas')); - display.clipViewport = false; - display.resize(4, 4); - }); - - it('should change the size of the logical canvas', function () { - display.resize(5, 7); - expect(display._fb_width).to.equal(5); - expect(display._fb_height).to.equal(7); - }); - - it('should keep the framebuffer data', function () { - display.fillRect(0, 0, 4, 4, [0, 0, 0xff]); - display.resize(2, 2); - display.flip(); - const expected = []; - for (let i = 0; i < 4 * 2*2; i += 4) { - expected[i] = 0xff; - expected[i+1] = expected[i+2] = 0; - expected[i+3] = 0xff; - } - expect(display).to.have.displayed(new Uint8Array(expected)); - }); - - describe('viewport', function () { - beforeEach(function () { - display.clipViewport = true; - display.viewportChangeSize(3, 3); - display.viewportChangePos(1, 1); - }); - - it('should keep the viewport position and size if possible', function () { - display.resize(6, 6); - expect(display.absX(0)).to.equal(1); - expect(display.absY(0)).to.equal(1); - expect(display._target.width).to.equal(3); - expect(display._target.height).to.equal(3); - }); - - it('should move the viewport if necessary', function () { - display.resize(3, 3); - expect(display.absX(0)).to.equal(0); - expect(display.absY(0)).to.equal(0); - expect(display._target.width).to.equal(3); - expect(display._target.height).to.equal(3); - }); - - it('should shrink the viewport if necessary', function () { - display.resize(2, 2); - expect(display.absX(0)).to.equal(0); - expect(display.absY(0)).to.equal(0); - expect(display._target.width).to.equal(2); - expect(display._target.height).to.equal(2); - }); - }); - }); - - describe('rescaling', function () { - let display; - let canvas; - - beforeEach(function () { - canvas = document.createElement('canvas'); - display = new Display(canvas); - display.clipViewport = true; - display.resize(4, 4); - display.viewportChangeSize(3, 3); - display.viewportChangePos(1, 1); - document.body.appendChild(canvas); - }); - - afterEach(function () { - document.body.removeChild(canvas); - }); - - it('should not change the bitmap size of the canvas', function () { - display.scale = 2.0; - expect(canvas.width).to.equal(3); - expect(canvas.height).to.equal(3); - }); - - it('should change the effective rendered size of the canvas', function () { - display.scale = 2.0; - expect(canvas.clientWidth).to.equal(6); - expect(canvas.clientHeight).to.equal(6); - }); - - it('should not change when resizing', function () { - display.scale = 2.0; - display.resize(5, 5); - expect(display.scale).to.equal(2.0); - expect(canvas.width).to.equal(3); - expect(canvas.height).to.equal(3); - expect(canvas.clientWidth).to.equal(6); - expect(canvas.clientHeight).to.equal(6); - }); - }); - - describe('autoscaling', function () { - let display; - let canvas; - - beforeEach(function () { - canvas = document.createElement('canvas'); - display = new Display(canvas); - display.clipViewport = true; - display.resize(4, 3); - document.body.appendChild(canvas); - }); - - afterEach(function () { - document.body.removeChild(canvas); - }); - - it('should preserve aspect ratio while autoscaling', function () { - display.autoscale(16, 9); - expect(canvas.clientWidth / canvas.clientHeight).to.equal(4 / 3); - }); - - it('should use width to determine scale when the current aspect ratio is wider than the target', function () { - display.autoscale(9, 16); - expect(display.absX(9)).to.equal(4); - expect(display.absY(18)).to.equal(8); - expect(canvas.clientWidth).to.equal(9); - expect(canvas.clientHeight).to.equal(7); // round 9 / (4 / 3) - }); - - it('should use height to determine scale when the current aspect ratio is taller than the target', function () { - display.autoscale(16, 9); - expect(display.absX(9)).to.equal(3); - expect(display.absY(18)).to.equal(6); - expect(canvas.clientWidth).to.equal(12); // 16 * (4 / 3) - expect(canvas.clientHeight).to.equal(9); - - }); - - it('should not change the bitmap size of the canvas', function () { - display.autoscale(16, 9); - expect(canvas.width).to.equal(4); - expect(canvas.height).to.equal(3); - }); - }); - - describe('drawing', function () { - - // TODO(directxman12): improve the tests for each of the drawing functions to cover more than just the - // basic cases - let display; - beforeEach(function () { - display = new Display(document.createElement('canvas')); - display.resize(4, 4); - }); - - it('should clear the screen on #clear without a logo set', function () { - display.fillRect(0, 0, 4, 4, [0x00, 0x00, 0xff]); - display._logo = null; - display.clear(); - display.resize(4, 4); - const empty = []; - for (let i = 0; i < 4 * display._fb_width * display._fb_height; i++) { empty[i] = 0; } - expect(display).to.have.displayed(new Uint8Array(empty)); - }); - - it('should draw the logo on #clear with a logo set', function (done) { - display._logo = { width: 4, height: 4, type: "image/png", data: make_image_png(checked_data) }; - display.clear(); - display.onflush = () => { - expect(display).to.have.displayed(checked_data); - expect(display._fb_width).to.equal(4); - expect(display._fb_height).to.equal(4); - done(); - }; - display.flush(); - }); - - it('should not draw directly on the target canvas', function () { - display.fillRect(0, 0, 4, 4, [0, 0, 0xff]); - display.flip(); - display.fillRect(0, 0, 4, 4, [0, 0xff, 0]); - const expected = []; - for (let i = 0; i < 4 * display._fb_width * display._fb_height; i += 4) { - expected[i] = 0xff; - expected[i+1] = expected[i+2] = 0; - expected[i+3] = 0xff; - } - expect(display).to.have.displayed(new Uint8Array(expected)); - }); - - it('should support filling a rectangle with particular color via #fillRect', function () { - display.fillRect(0, 0, 4, 4, [0, 0xff, 0]); - display.fillRect(0, 0, 2, 2, [0xff, 0, 0]); - display.fillRect(2, 2, 2, 2, [0xff, 0, 0]); - display.flip(); - expect(display).to.have.displayed(checked_data); - }); - - it('should support copying an portion of the canvas via #copyImage', function () { - display.fillRect(0, 0, 4, 4, [0, 0xff, 0]); - display.fillRect(0, 0, 2, 2, [0xff, 0, 0x00]); - display.copyImage(0, 0, 2, 2, 2, 2); - display.flip(); - expect(display).to.have.displayed(checked_data); - }); - - it('should support drawing images via #imageRect', function (done) { - display.imageRect(0, 0, "image/png", make_image_png(checked_data)); - display.flip(); - display.onflush = () => { - expect(display).to.have.displayed(checked_data); - done(); - }; - display.flush(); - }); - - it('should support drawing tile data with a background color and sub tiles', function () { - display.startTile(0, 0, 4, 4, [0, 0xff, 0]); - display.subTile(0, 0, 2, 2, [0xff, 0, 0]); - display.subTile(2, 2, 2, 2, [0xff, 0, 0]); - display.finishTile(); - display.flip(); - expect(display).to.have.displayed(checked_data); - }); - - // We have a special cache for 16x16 tiles that we need to test - it('should support drawing a 16x16 tile', function () { - const large_checked_data = new Uint8Array(16*16*4); - display.resize(16, 16); - - for (let y = 0;y < 16;y++) { - for (let x = 0;x < 16;x++) { - let pixel; - if ((x < 4) && (y < 4)) { - // NB: of course IE11 doesn't support #slice on ArrayBufferViews... - pixel = Array.prototype.slice.call(checked_data, (y*4+x)*4, (y*4+x+1)*4); - } else { - pixel = [0, 0xff, 0, 255]; - } - large_checked_data.set(pixel, (y*16+x)*4); - } - } - - display.startTile(0, 0, 16, 16, [0, 0xff, 0]); - display.subTile(0, 0, 2, 2, [0xff, 0, 0]); - display.subTile(2, 2, 2, 2, [0xff, 0, 0]); - display.finishTile(); - display.flip(); - expect(display).to.have.displayed(large_checked_data); - }); - - it('should support drawing BGRX blit images with true color via #blitImage', function () { - const data = []; - for (let i = 0; i < 16; i++) { - data[i * 4] = checked_data[i * 4 + 2]; - data[i * 4 + 1] = checked_data[i * 4 + 1]; - data[i * 4 + 2] = checked_data[i * 4]; - data[i * 4 + 3] = checked_data[i * 4 + 3]; - } - display.blitImage(0, 0, 4, 4, data, 0); - display.flip(); - expect(display).to.have.displayed(checked_data); - }); - - it('should support drawing RGB blit images with true color via #blitRgbImage', function () { - const data = []; - for (let i = 0; i < 16; i++) { - data[i * 3] = checked_data[i * 4]; - data[i * 3 + 1] = checked_data[i * 4 + 1]; - data[i * 3 + 2] = checked_data[i * 4 + 2]; - } - display.blitRgbImage(0, 0, 4, 4, data, 0); - display.flip(); - expect(display).to.have.displayed(checked_data); - }); - - it('should support drawing an image object via #drawImage', function () { - const img = make_image_canvas(checked_data); - display.drawImage(img, 0, 0); - display.flip(); - expect(display).to.have.displayed(checked_data); - }); - }); - - describe('the render queue processor', function () { - let display; - beforeEach(function () { - display = new Display(document.createElement('canvas')); - display.resize(4, 4); - sinon.spy(display, '_scan_renderQ'); - }); - - afterEach(function () { - window.requestAnimationFrame = this.old_requestAnimationFrame; - }); - - it('should try to process an item when it is pushed on, if nothing else is on the queue', function () { - display._renderQ_push({ type: 'noop' }); // does nothing - expect(display._scan_renderQ).to.have.been.calledOnce; - }); - - it('should not try to process an item when it is pushed on if we are waiting for other items', function () { - display._renderQ.length = 2; - display._renderQ_push({ type: 'noop' }); - expect(display._scan_renderQ).to.not.have.been.called; - }); - - it('should wait until an image is loaded to attempt to draw it and the rest of the queue', function () { - const img = { complete: false, addEventListener: sinon.spy() }; - display._renderQ = [{ type: 'img', x: 3, y: 4, img: img }, - { type: 'fill', x: 1, y: 2, width: 3, height: 4, color: 5 }]; - display.drawImage = sinon.spy(); - display.fillRect = sinon.spy(); - - display._scan_renderQ(); - expect(display.drawImage).to.not.have.been.called; - expect(display.fillRect).to.not.have.been.called; - expect(img.addEventListener).to.have.been.calledOnce; - - display._renderQ[0].img.complete = true; - display._scan_renderQ(); - expect(display.drawImage).to.have.been.calledOnce; - expect(display.fillRect).to.have.been.calledOnce; - expect(img.addEventListener).to.have.been.calledOnce; - }); - - it('should call callback when queue is flushed', function () { - display.onflush = sinon.spy(); - display.fillRect(0, 0, 4, 4, [0, 0xff, 0]); - expect(display.onflush).to.not.have.been.called; - display.flush(); - expect(display.onflush).to.have.been.calledOnce; - }); - - it('should draw a blit image on type "blit"', function () { - display.blitImage = sinon.spy(); - display._renderQ_push({ type: 'blit', x: 3, y: 4, width: 5, height: 6, data: [7, 8, 9] }); - expect(display.blitImage).to.have.been.calledOnce; - expect(display.blitImage).to.have.been.calledWith(3, 4, 5, 6, [7, 8, 9], 0); - }); - - it('should draw a blit RGB image on type "blitRgb"', function () { - display.blitRgbImage = sinon.spy(); - display._renderQ_push({ type: 'blitRgb', x: 3, y: 4, width: 5, height: 6, data: [7, 8, 9] }); - expect(display.blitRgbImage).to.have.been.calledOnce; - expect(display.blitRgbImage).to.have.been.calledWith(3, 4, 5, 6, [7, 8, 9], 0); - }); - - it('should copy a region on type "copy"', function () { - display.copyImage = sinon.spy(); - display._renderQ_push({ type: 'copy', x: 3, y: 4, width: 5, height: 6, old_x: 7, old_y: 8 }); - expect(display.copyImage).to.have.been.calledOnce; - expect(display.copyImage).to.have.been.calledWith(7, 8, 3, 4, 5, 6); - }); - - it('should fill a rect with a given color on type "fill"', function () { - display.fillRect = sinon.spy(); - display._renderQ_push({ type: 'fill', x: 3, y: 4, width: 5, height: 6, color: [7, 8, 9]}); - expect(display.fillRect).to.have.been.calledOnce; - expect(display.fillRect).to.have.been.calledWith(3, 4, 5, 6, [7, 8, 9]); - }); - - it('should draw an image from an image object on type "img" (if complete)', function () { - display.drawImage = sinon.spy(); - display._renderQ_push({ type: 'img', x: 3, y: 4, img: { complete: true } }); - expect(display.drawImage).to.have.been.calledOnce; - expect(display.drawImage).to.have.been.calledWith({ complete: true }, 3, 4); - }); - }); -}); diff --git a/systemvm/agent/noVNC/tests/test.helper.js b/systemvm/agent/noVNC/tests/test.helper.js deleted file mode 100644 index d44bab0fe2dc..000000000000 --- a/systemvm/agent/noVNC/tests/test.helper.js +++ /dev/null @@ -1,223 +0,0 @@ -const expect = chai.expect; - -import keysyms from '../core/input/keysymdef.js'; -import * as KeyboardUtil from "../core/input/util.js"; -import * as browser from '../core/util/browser.js'; - -describe('Helpers', function () { - "use strict"; - - describe('keysyms.lookup', function () { - it('should map ASCII characters to keysyms', function () { - expect(keysyms.lookup('a'.charCodeAt())).to.be.equal(0x61); - expect(keysyms.lookup('A'.charCodeAt())).to.be.equal(0x41); - }); - it('should map Latin-1 characters to keysyms', function () { - expect(keysyms.lookup('ø'.charCodeAt())).to.be.equal(0xf8); - - expect(keysyms.lookup('é'.charCodeAt())).to.be.equal(0xe9); - }); - it('should map characters that are in Windows-1252 but not in Latin-1 to keysyms', function () { - expect(keysyms.lookup('Š'.charCodeAt())).to.be.equal(0x01a9); - }); - it('should map characters which aren\'t in Latin1 *or* Windows-1252 to keysyms', function () { - expect(keysyms.lookup('ũ'.charCodeAt())).to.be.equal(0x03fd); - }); - it('should map unknown codepoints to the Unicode range', function () { - expect(keysyms.lookup('\n'.charCodeAt())).to.be.equal(0x100000a); - expect(keysyms.lookup('\u262D'.charCodeAt())).to.be.equal(0x100262d); - }); - // This requires very recent versions of most browsers... skipping for now - it.skip('should map UCS-4 codepoints to the Unicode range', function () { - //expect(keysyms.lookup('\u{1F686}'.codePointAt())).to.be.equal(0x101f686); - }); - }); - - describe('getKeycode', function () { - it('should pass through proper code', function () { - expect(KeyboardUtil.getKeycode({code: 'Semicolon'})).to.be.equal('Semicolon'); - }); - it('should map legacy values', function () { - expect(KeyboardUtil.getKeycode({code: ''})).to.be.equal('Unidentified'); - expect(KeyboardUtil.getKeycode({code: 'OSLeft'})).to.be.equal('MetaLeft'); - }); - it('should map keyCode to code when possible', function () { - expect(KeyboardUtil.getKeycode({keyCode: 0x14})).to.be.equal('CapsLock'); - expect(KeyboardUtil.getKeycode({keyCode: 0x5b})).to.be.equal('MetaLeft'); - expect(KeyboardUtil.getKeycode({keyCode: 0x35})).to.be.equal('Digit5'); - expect(KeyboardUtil.getKeycode({keyCode: 0x65})).to.be.equal('Numpad5'); - }); - it('should map keyCode left/right side', function () { - expect(KeyboardUtil.getKeycode({keyCode: 0x10, location: 1})).to.be.equal('ShiftLeft'); - expect(KeyboardUtil.getKeycode({keyCode: 0x10, location: 2})).to.be.equal('ShiftRight'); - expect(KeyboardUtil.getKeycode({keyCode: 0x11, location: 1})).to.be.equal('ControlLeft'); - expect(KeyboardUtil.getKeycode({keyCode: 0x11, location: 2})).to.be.equal('ControlRight'); - }); - it('should map keyCode on numpad', function () { - expect(KeyboardUtil.getKeycode({keyCode: 0x0d, location: 0})).to.be.equal('Enter'); - expect(KeyboardUtil.getKeycode({keyCode: 0x0d, location: 3})).to.be.equal('NumpadEnter'); - expect(KeyboardUtil.getKeycode({keyCode: 0x23, location: 0})).to.be.equal('End'); - expect(KeyboardUtil.getKeycode({keyCode: 0x23, location: 3})).to.be.equal('Numpad1'); - }); - it('should return Unidentified when it cannot map the keyCode', function () { - expect(KeyboardUtil.getKeycode({keycode: 0x42})).to.be.equal('Unidentified'); - }); - - describe('Fix Meta on macOS', function () { - let origNavigator; - beforeEach(function () { - // window.navigator is a protected read-only property in many - // environments, so we need to redefine it whilst running these - // tests. - origNavigator = Object.getOwnPropertyDescriptor(window, "navigator"); - if (origNavigator === undefined) { - // Object.getOwnPropertyDescriptor() doesn't work - // properly in any version of IE - this.skip(); - } - - Object.defineProperty(window, "navigator", {value: {}}); - if (window.navigator.platform !== undefined) { - // Object.defineProperty() doesn't work properly in old - // versions of Chrome - this.skip(); - } - - window.navigator.platform = "Mac x86_64"; - }); - afterEach(function () { - Object.defineProperty(window, "navigator", origNavigator); - }); - - it('should respect ContextMenu on modern browser', function () { - expect(KeyboardUtil.getKeycode({code: 'ContextMenu', keyCode: 0x5d})).to.be.equal('ContextMenu'); - }); - it('should translate legacy ContextMenu to MetaRight', function () { - expect(KeyboardUtil.getKeycode({keyCode: 0x5d})).to.be.equal('MetaRight'); - }); - }); - }); - - describe('getKey', function () { - it('should prefer key', function () { - if (browser.isIE() || browser.isEdge()) this.skip(); - expect(KeyboardUtil.getKey({key: 'a', charCode: 'Š'.charCodeAt(), keyCode: 0x42, which: 0x43})).to.be.equal('a'); - }); - it('should map legacy values', function () { - expect(KeyboardUtil.getKey({key: 'Spacebar'})).to.be.equal(' '); - expect(KeyboardUtil.getKey({key: 'Left'})).to.be.equal('ArrowLeft'); - expect(KeyboardUtil.getKey({key: 'OS'})).to.be.equal('Meta'); - expect(KeyboardUtil.getKey({key: 'Win'})).to.be.equal('Meta'); - expect(KeyboardUtil.getKey({key: 'UIKeyInputLeftArrow'})).to.be.equal('ArrowLeft'); - }); - it('should use code if no key', function () { - expect(KeyboardUtil.getKey({code: 'NumpadBackspace'})).to.be.equal('Backspace'); - }); - it('should not use code fallback for character keys', function () { - expect(KeyboardUtil.getKey({code: 'KeyA'})).to.be.equal('Unidentified'); - expect(KeyboardUtil.getKey({code: 'Digit1'})).to.be.equal('Unidentified'); - expect(KeyboardUtil.getKey({code: 'Period'})).to.be.equal('Unidentified'); - expect(KeyboardUtil.getKey({code: 'Numpad1'})).to.be.equal('Unidentified'); - }); - it('should use charCode if no key', function () { - expect(KeyboardUtil.getKey({charCode: 'Š'.charCodeAt(), keyCode: 0x42, which: 0x43})).to.be.equal('Š'); - }); - it('should return Unidentified when it cannot map the key', function () { - expect(KeyboardUtil.getKey({keycode: 0x42})).to.be.equal('Unidentified'); - }); - - describe('Broken key AltGraph on IE/Edge', function () { - let origNavigator; - beforeEach(function () { - // window.navigator is a protected read-only property in many - // environments, so we need to redefine it whilst running these - // tests. - origNavigator = Object.getOwnPropertyDescriptor(window, "navigator"); - if (origNavigator === undefined) { - // Object.getOwnPropertyDescriptor() doesn't work - // properly in any version of IE - this.skip(); - } - - Object.defineProperty(window, "navigator", {value: {}}); - if (window.navigator.platform !== undefined) { - // Object.defineProperty() doesn't work properly in old - // versions of Chrome - this.skip(); - } - }); - afterEach(function () { - Object.defineProperty(window, "navigator", origNavigator); - }); - - it('should ignore printable character key on IE', function () { - window.navigator.userAgent = "Mozilla/5.0 (Windows NT 6.3; Trident/7.0; rv:11.0) like Gecko"; - expect(KeyboardUtil.getKey({key: 'a'})).to.be.equal('Unidentified'); - }); - it('should ignore printable character key on Edge', function () { - window.navigator.userAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.79 Safari/537.36 Edge/14.14393"; - expect(KeyboardUtil.getKey({key: 'a'})).to.be.equal('Unidentified'); - }); - it('should allow non-printable character key on IE', function () { - window.navigator.userAgent = "Mozilla/5.0 (Windows NT 6.3; Trident/7.0; rv:11.0) like Gecko"; - expect(KeyboardUtil.getKey({key: 'Shift'})).to.be.equal('Shift'); - }); - it('should allow non-printable character key on Edge', function () { - window.navigator.userAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.79 Safari/537.36 Edge/14.14393"; - expect(KeyboardUtil.getKey({key: 'Shift'})).to.be.equal('Shift'); - }); - }); - }); - - describe('getKeysym', function () { - describe('Non-character keys', function () { - it('should recognize the right keys', function () { - expect(KeyboardUtil.getKeysym({key: 'Enter'})).to.be.equal(0xFF0D); - expect(KeyboardUtil.getKeysym({key: 'Backspace'})).to.be.equal(0xFF08); - expect(KeyboardUtil.getKeysym({key: 'Tab'})).to.be.equal(0xFF09); - expect(KeyboardUtil.getKeysym({key: 'Shift'})).to.be.equal(0xFFE1); - expect(KeyboardUtil.getKeysym({key: 'Control'})).to.be.equal(0xFFE3); - expect(KeyboardUtil.getKeysym({key: 'Alt'})).to.be.equal(0xFFE9); - expect(KeyboardUtil.getKeysym({key: 'Meta'})).to.be.equal(0xFFEB); - expect(KeyboardUtil.getKeysym({key: 'Escape'})).to.be.equal(0xFF1B); - expect(KeyboardUtil.getKeysym({key: 'ArrowUp'})).to.be.equal(0xFF52); - }); - it('should map left/right side', function () { - expect(KeyboardUtil.getKeysym({key: 'Shift', location: 1})).to.be.equal(0xFFE1); - expect(KeyboardUtil.getKeysym({key: 'Shift', location: 2})).to.be.equal(0xFFE2); - expect(KeyboardUtil.getKeysym({key: 'Control', location: 1})).to.be.equal(0xFFE3); - expect(KeyboardUtil.getKeysym({key: 'Control', location: 2})).to.be.equal(0xFFE4); - }); - it('should handle AltGraph', function () { - expect(KeyboardUtil.getKeysym({code: 'AltRight', key: 'Alt', location: 2})).to.be.equal(0xFFEA); - expect(KeyboardUtil.getKeysym({code: 'AltRight', key: 'AltGraph', location: 2})).to.be.equal(0xFE03); - }); - it('should return null for unknown keys', function () { - expect(KeyboardUtil.getKeysym({key: 'Semicolon'})).to.be.null; - expect(KeyboardUtil.getKeysym({key: 'BracketRight'})).to.be.null; - }); - it('should handle remappings', function () { - expect(KeyboardUtil.getKeysym({code: 'ControlLeft', key: 'Tab'})).to.be.equal(0xFF09); - }); - }); - - describe('Numpad', function () { - it('should handle Numpad numbers', function () { - if (browser.isIE() || browser.isEdge()) this.skip(); - expect(KeyboardUtil.getKeysym({code: 'Digit5', key: '5', location: 0})).to.be.equal(0x0035); - expect(KeyboardUtil.getKeysym({code: 'Numpad5', key: '5', location: 3})).to.be.equal(0xFFB5); - }); - it('should handle Numpad non-character keys', function () { - expect(KeyboardUtil.getKeysym({code: 'Home', key: 'Home', location: 0})).to.be.equal(0xFF50); - expect(KeyboardUtil.getKeysym({code: 'Numpad5', key: 'Home', location: 3})).to.be.equal(0xFF95); - expect(KeyboardUtil.getKeysym({code: 'Delete', key: 'Delete', location: 0})).to.be.equal(0xFFFF); - expect(KeyboardUtil.getKeysym({code: 'NumpadDecimal', key: 'Delete', location: 3})).to.be.equal(0xFF9F); - }); - it('should handle Numpad Decimal key', function () { - if (browser.isIE() || browser.isEdge()) this.skip(); - expect(KeyboardUtil.getKeysym({code: 'NumpadDecimal', key: '.', location: 3})).to.be.equal(0xFFAE); - expect(KeyboardUtil.getKeysym({code: 'NumpadDecimal', key: ',', location: 3})).to.be.equal(0xFFAC); - }); - }); - }); -}); diff --git a/systemvm/agent/noVNC/tests/test.keyboard.js b/systemvm/agent/noVNC/tests/test.keyboard.js deleted file mode 100644 index 77fe3f6f968f..000000000000 --- a/systemvm/agent/noVNC/tests/test.keyboard.js +++ /dev/null @@ -1,510 +0,0 @@ -const expect = chai.expect; - -import Keyboard from '../core/input/keyboard.js'; -import * as browser from '../core/util/browser.js'; - -describe('Key Event Handling', function () { - "use strict"; - - // The real KeyboardEvent constructor might not work everywhere we - // want to run these tests - function keyevent(typeArg, KeyboardEventInit) { - const e = { type: typeArg }; - for (let key in KeyboardEventInit) { - e[key] = KeyboardEventInit[key]; - } - e.stopPropagation = sinon.spy(); - e.preventDefault = sinon.spy(); - return e; - } - - describe('Decode Keyboard Events', function () { - it('should decode keydown events', function (done) { - if (browser.isIE() || browser.isEdge()) this.skip(); - const kbd = new Keyboard(document); - kbd.onkeyevent = (keysym, code, down) => { - expect(keysym).to.be.equal(0x61); - expect(code).to.be.equal('KeyA'); - expect(down).to.be.equal(true); - done(); - }; - kbd._handleKeyDown(keyevent('keydown', {code: 'KeyA', key: 'a'})); - }); - it('should decode keyup events', function (done) { - if (browser.isIE() || browser.isEdge()) this.skip(); - let calls = 0; - const kbd = new Keyboard(document); - kbd.onkeyevent = (keysym, code, down) => { - expect(keysym).to.be.equal(0x61); - expect(code).to.be.equal('KeyA'); - if (calls++ === 1) { - expect(down).to.be.equal(false); - done(); - } - }; - kbd._handleKeyDown(keyevent('keydown', {code: 'KeyA', key: 'a'})); - kbd._handleKeyUp(keyevent('keyup', {code: 'KeyA', key: 'a'})); - }); - - describe('Legacy keypress Events', function () { - it('should wait for keypress when needed', function () { - const kbd = new Keyboard(document); - kbd.onkeyevent = sinon.spy(); - kbd._handleKeyDown(keyevent('keydown', {code: 'KeyA', keyCode: 0x41})); - expect(kbd.onkeyevent).to.not.have.been.called; - }); - it('should decode keypress events', function (done) { - const kbd = new Keyboard(document); - kbd.onkeyevent = (keysym, code, down) => { - expect(keysym).to.be.equal(0x61); - expect(code).to.be.equal('KeyA'); - expect(down).to.be.equal(true); - done(); - }; - kbd._handleKeyDown(keyevent('keydown', {code: 'KeyA', keyCode: 0x41})); - kbd._handleKeyPress(keyevent('keypress', {code: 'KeyA', charCode: 0x61})); - }); - it('should ignore keypress with different code', function () { - const kbd = new Keyboard(document); - kbd.onkeyevent = sinon.spy(); - kbd._handleKeyDown(keyevent('keydown', {code: 'KeyA', keyCode: 0x41})); - kbd._handleKeyPress(keyevent('keypress', {code: 'KeyB', charCode: 0x61})); - expect(kbd.onkeyevent).to.not.have.been.called; - }); - it('should handle keypress with missing code', function (done) { - const kbd = new Keyboard(document); - kbd.onkeyevent = (keysym, code, down) => { - expect(keysym).to.be.equal(0x61); - expect(code).to.be.equal('KeyA'); - expect(down).to.be.equal(true); - done(); - }; - kbd._handleKeyDown(keyevent('keydown', {code: 'KeyA', keyCode: 0x41})); - kbd._handleKeyPress(keyevent('keypress', {charCode: 0x61})); - }); - it('should guess key if no keypress and numeric key', function (done) { - const kbd = new Keyboard(document); - kbd.onkeyevent = (keysym, code, down) => { - expect(keysym).to.be.equal(0x32); - expect(code).to.be.equal('Digit2'); - expect(down).to.be.equal(true); - done(); - }; - kbd._handleKeyDown(keyevent('keydown', {code: 'Digit2', keyCode: 0x32})); - }); - it('should guess key if no keypress and alpha key', function (done) { - const kbd = new Keyboard(document); - kbd.onkeyevent = (keysym, code, down) => { - expect(keysym).to.be.equal(0x61); - expect(code).to.be.equal('KeyA'); - expect(down).to.be.equal(true); - done(); - }; - kbd._handleKeyDown(keyevent('keydown', {code: 'KeyA', keyCode: 0x41, shiftKey: false})); - }); - it('should guess key if no keypress and alpha key (with shift)', function (done) { - const kbd = new Keyboard(document); - kbd.onkeyevent = (keysym, code, down) => { - expect(keysym).to.be.equal(0x41); - expect(code).to.be.equal('KeyA'); - expect(down).to.be.equal(true); - done(); - }; - kbd._handleKeyDown(keyevent('keydown', {code: 'KeyA', keyCode: 0x41, shiftKey: true})); - }); - it('should not guess key if no keypress and unknown key', function (done) { - const kbd = new Keyboard(document); - kbd.onkeyevent = (keysym, code, down) => { - expect(keysym).to.be.equal(0); - expect(code).to.be.equal('KeyA'); - expect(down).to.be.equal(true); - done(); - }; - kbd._handleKeyDown(keyevent('keydown', {code: 'KeyA', keyCode: 0x09})); - }); - }); - - describe('suppress the right events at the right time', function () { - beforeEach(function () { - if (browser.isIE() || browser.isEdge()) this.skip(); - }); - it('should suppress anything with a valid key', function () { - const kbd = new Keyboard(document, {}); - const evt1 = keyevent('keydown', {code: 'KeyA', key: 'a'}); - kbd._handleKeyDown(evt1); - expect(evt1.preventDefault).to.have.been.called; - const evt2 = keyevent('keyup', {code: 'KeyA', key: 'a'}); - kbd._handleKeyUp(evt2); - expect(evt2.preventDefault).to.have.been.called; - }); - it('should not suppress keys without key', function () { - const kbd = new Keyboard(document, {}); - const evt = keyevent('keydown', {code: 'KeyA', keyCode: 0x41}); - kbd._handleKeyDown(evt); - expect(evt.preventDefault).to.not.have.been.called; - }); - it('should suppress the following keypress event', function () { - const kbd = new Keyboard(document, {}); - const evt1 = keyevent('keydown', {code: 'KeyA', keyCode: 0x41}); - kbd._handleKeyDown(evt1); - const evt2 = keyevent('keypress', {code: 'KeyA', charCode: 0x41}); - kbd._handleKeyPress(evt2); - expect(evt2.preventDefault).to.have.been.called; - }); - }); - }); - - describe('Fake keyup', function () { - it('should fake keyup events for virtual keyboards', function (done) { - if (browser.isIE() || browser.isEdge()) this.skip(); - let count = 0; - const kbd = new Keyboard(document); - kbd.onkeyevent = (keysym, code, down) => { - switch (count++) { - case 0: - expect(keysym).to.be.equal(0x61); - expect(code).to.be.equal('Unidentified'); - expect(down).to.be.equal(true); - break; - case 1: - expect(keysym).to.be.equal(0x61); - expect(code).to.be.equal('Unidentified'); - expect(down).to.be.equal(false); - done(); - } - }; - kbd._handleKeyDown(keyevent('keydown', {code: 'Unidentified', key: 'a'})); - }); - - describe('iOS', function () { - let origNavigator; - beforeEach(function () { - // window.navigator is a protected read-only property in many - // environments, so we need to redefine it whilst running these - // tests. - origNavigator = Object.getOwnPropertyDescriptor(window, "navigator"); - if (origNavigator === undefined) { - // Object.getOwnPropertyDescriptor() doesn't work - // properly in any version of IE - this.skip(); - } - - Object.defineProperty(window, "navigator", {value: {}}); - if (window.navigator.platform !== undefined) { - // Object.defineProperty() doesn't work properly in old - // versions of Chrome - this.skip(); - } - - window.navigator.platform = "iPhone 9.0"; - }); - afterEach(function () { - Object.defineProperty(window, "navigator", origNavigator); - }); - - it('should fake keyup events on iOS', function (done) { - if (browser.isIE() || browser.isEdge()) this.skip(); - let count = 0; - const kbd = new Keyboard(document); - kbd.onkeyevent = (keysym, code, down) => { - switch (count++) { - case 0: - expect(keysym).to.be.equal(0x61); - expect(code).to.be.equal('KeyA'); - expect(down).to.be.equal(true); - break; - case 1: - expect(keysym).to.be.equal(0x61); - expect(code).to.be.equal('KeyA'); - expect(down).to.be.equal(false); - done(); - } - }; - kbd._handleKeyDown(keyevent('keydown', {code: 'KeyA', key: 'a'})); - }); - }); - }); - - describe('Track Key State', function () { - beforeEach(function () { - if (browser.isIE() || browser.isEdge()) this.skip(); - }); - it('should send release using the same keysym as the press', function (done) { - const kbd = new Keyboard(document); - kbd.onkeyevent = (keysym, code, down) => { - expect(keysym).to.be.equal(0x61); - expect(code).to.be.equal('KeyA'); - if (!down) { - done(); - } - }; - kbd._handleKeyDown(keyevent('keydown', {code: 'KeyA', key: 'a'})); - kbd._handleKeyUp(keyevent('keyup', {code: 'KeyA', key: 'b'})); - }); - it('should send the same keysym for multiple presses', function () { - let count = 0; - const kbd = new Keyboard(document); - kbd.onkeyevent = (keysym, code, down) => { - expect(keysym).to.be.equal(0x61); - expect(code).to.be.equal('KeyA'); - expect(down).to.be.equal(true); - count++; - }; - kbd._handleKeyDown(keyevent('keydown', {code: 'KeyA', key: 'a'})); - kbd._handleKeyDown(keyevent('keydown', {code: 'KeyA', key: 'b'})); - expect(count).to.be.equal(2); - }); - it('should do nothing on keyup events if no keys are down', function () { - const kbd = new Keyboard(document); - kbd.onkeyevent = sinon.spy(); - kbd._handleKeyUp(keyevent('keyup', {code: 'KeyA', key: 'a'})); - expect(kbd.onkeyevent).to.not.have.been.called; - }); - - describe('Legacy Events', function () { - it('should track keys using keyCode if no code', function (done) { - const kbd = new Keyboard(document); - kbd.onkeyevent = (keysym, code, down) => { - expect(keysym).to.be.equal(0x61); - expect(code).to.be.equal('Platform65'); - if (!down) { - done(); - } - }; - kbd._handleKeyDown(keyevent('keydown', {keyCode: 65, key: 'a'})); - kbd._handleKeyUp(keyevent('keyup', {keyCode: 65, key: 'b'})); - }); - it('should ignore compositing code', function () { - const kbd = new Keyboard(document); - kbd.onkeyevent = (keysym, code, down) => { - expect(keysym).to.be.equal(0x61); - expect(code).to.be.equal('Unidentified'); - }; - kbd._handleKeyDown(keyevent('keydown', {keyCode: 229, key: 'a'})); - }); - it('should track keys using keyIdentifier if no code', function (done) { - const kbd = new Keyboard(document); - kbd.onkeyevent = (keysym, code, down) => { - expect(keysym).to.be.equal(0x61); - expect(code).to.be.equal('Platform65'); - if (!down) { - done(); - } - }; - kbd._handleKeyDown(keyevent('keydown', {keyIdentifier: 'U+0041', key: 'a'})); - kbd._handleKeyUp(keyevent('keyup', {keyIdentifier: 'U+0041', key: 'b'})); - }); - }); - }); - - describe('Shuffle modifiers on macOS', function () { - let origNavigator; - beforeEach(function () { - // window.navigator is a protected read-only property in many - // environments, so we need to redefine it whilst running these - // tests. - origNavigator = Object.getOwnPropertyDescriptor(window, "navigator"); - if (origNavigator === undefined) { - // Object.getOwnPropertyDescriptor() doesn't work - // properly in any version of IE - this.skip(); - } - - Object.defineProperty(window, "navigator", {value: {}}); - if (window.navigator.platform !== undefined) { - // Object.defineProperty() doesn't work properly in old - // versions of Chrome - this.skip(); - } - - window.navigator.platform = "Mac x86_64"; - }); - afterEach(function () { - Object.defineProperty(window, "navigator", origNavigator); - }); - - it('should change Alt to AltGraph', function () { - let count = 0; - const kbd = new Keyboard(document); - kbd.onkeyevent = (keysym, code, down) => { - switch (count++) { - case 0: - expect(keysym).to.be.equal(0xFF7E); - expect(code).to.be.equal('AltLeft'); - break; - case 1: - expect(keysym).to.be.equal(0xFE03); - expect(code).to.be.equal('AltRight'); - break; - } - }; - kbd._handleKeyDown(keyevent('keydown', {code: 'AltLeft', key: 'Alt', location: 1})); - kbd._handleKeyDown(keyevent('keydown', {code: 'AltRight', key: 'Alt', location: 2})); - expect(count).to.be.equal(2); - }); - it('should change left Super to Alt', function (done) { - const kbd = new Keyboard(document); - kbd.onkeyevent = (keysym, code, down) => { - expect(keysym).to.be.equal(0xFFE9); - expect(code).to.be.equal('MetaLeft'); - done(); - }; - kbd._handleKeyDown(keyevent('keydown', {code: 'MetaLeft', key: 'Meta', location: 1})); - }); - it('should change right Super to left Super', function (done) { - const kbd = new Keyboard(document); - kbd.onkeyevent = (keysym, code, down) => { - expect(keysym).to.be.equal(0xFFEB); - expect(code).to.be.equal('MetaRight'); - done(); - }; - kbd._handleKeyDown(keyevent('keydown', {code: 'MetaRight', key: 'Meta', location: 2})); - }); - }); - - describe('Escape AltGraph on Windows', function () { - let origNavigator; - beforeEach(function () { - // window.navigator is a protected read-only property in many - // environments, so we need to redefine it whilst running these - // tests. - origNavigator = Object.getOwnPropertyDescriptor(window, "navigator"); - if (origNavigator === undefined) { - // Object.getOwnPropertyDescriptor() doesn't work - // properly in any version of IE - this.skip(); - } - - Object.defineProperty(window, "navigator", {value: {}}); - if (window.navigator.platform !== undefined) { - // Object.defineProperty() doesn't work properly in old - // versions of Chrome - this.skip(); - } - - window.navigator.platform = "Windows x86_64"; - - this.clock = sinon.useFakeTimers(); - }); - afterEach(function () { - Object.defineProperty(window, "navigator", origNavigator); - this.clock.restore(); - }); - - it('should supress ControlLeft until it knows if it is AltGr', function () { - const kbd = new Keyboard(document); - kbd.onkeyevent = sinon.spy(); - kbd._handleKeyDown(keyevent('keydown', {code: 'ControlLeft', key: 'Control', location: 1})); - expect(kbd.onkeyevent).to.not.have.been.called; - }); - - it('should not trigger on repeating ControlLeft', function () { - const kbd = new Keyboard(document); - kbd.onkeyevent = sinon.spy(); - kbd._handleKeyDown(keyevent('keydown', {code: 'ControlLeft', key: 'Control', location: 1})); - kbd._handleKeyDown(keyevent('keydown', {code: 'ControlLeft', key: 'Control', location: 1})); - expect(kbd.onkeyevent).to.have.been.calledTwice; - expect(kbd.onkeyevent.firstCall).to.have.been.calledWith(0xffe3, "ControlLeft", true); - expect(kbd.onkeyevent.secondCall).to.have.been.calledWith(0xffe3, "ControlLeft", true); - }); - - it('should not supress ControlRight', function () { - const kbd = new Keyboard(document); - kbd.onkeyevent = sinon.spy(); - kbd._handleKeyDown(keyevent('keydown', {code: 'ControlRight', key: 'Control', location: 2})); - expect(kbd.onkeyevent).to.have.been.calledOnce; - expect(kbd.onkeyevent).to.have.been.calledWith(0xffe4, "ControlRight", true); - }); - - it('should release ControlLeft after 100 ms', function () { - const kbd = new Keyboard(document); - kbd.onkeyevent = sinon.spy(); - kbd._handleKeyDown(keyevent('keydown', {code: 'ControlLeft', key: 'Control', location: 1})); - expect(kbd.onkeyevent).to.not.have.been.called; - this.clock.tick(100); - expect(kbd.onkeyevent).to.have.been.calledOnce; - expect(kbd.onkeyevent).to.have.been.calledWith(0xffe3, "ControlLeft", true); - }); - - it('should release ControlLeft on other key press', function () { - const kbd = new Keyboard(document); - kbd.onkeyevent = sinon.spy(); - kbd._handleKeyDown(keyevent('keydown', {code: 'ControlLeft', key: 'Control', location: 1})); - expect(kbd.onkeyevent).to.not.have.been.called; - kbd._handleKeyDown(keyevent('keydown', {code: 'KeyA', key: 'a'})); - expect(kbd.onkeyevent).to.have.been.calledTwice; - expect(kbd.onkeyevent.firstCall).to.have.been.calledWith(0xffe3, "ControlLeft", true); - expect(kbd.onkeyevent.secondCall).to.have.been.calledWith(0x61, "KeyA", true); - - // Check that the timer is properly dead - kbd.onkeyevent.reset(); - this.clock.tick(100); - expect(kbd.onkeyevent).to.not.have.been.called; - }); - - it('should release ControlLeft on other key release', function () { - const kbd = new Keyboard(document); - kbd.onkeyevent = sinon.spy(); - kbd._handleKeyDown(keyevent('keydown', {code: 'KeyA', key: 'a'})); - kbd._handleKeyDown(keyevent('keydown', {code: 'ControlLeft', key: 'Control', location: 1})); - expect(kbd.onkeyevent).to.have.been.calledOnce; - expect(kbd.onkeyevent.firstCall).to.have.been.calledWith(0x61, "KeyA", true); - kbd._handleKeyUp(keyevent('keyup', {code: 'KeyA', key: 'a'})); - expect(kbd.onkeyevent).to.have.been.calledThrice; - expect(kbd.onkeyevent.secondCall).to.have.been.calledWith(0xffe3, "ControlLeft", true); - expect(kbd.onkeyevent.thirdCall).to.have.been.calledWith(0x61, "KeyA", false); - - // Check that the timer is properly dead - kbd.onkeyevent.reset(); - this.clock.tick(100); - expect(kbd.onkeyevent).to.not.have.been.called; - }); - - it('should generate AltGraph for quick Ctrl+Alt sequence', function () { - const kbd = new Keyboard(document); - kbd.onkeyevent = sinon.spy(); - kbd._handleKeyDown(keyevent('keydown', {code: 'ControlLeft', key: 'Control', location: 1, timeStamp: Date.now()})); - this.clock.tick(20); - kbd._handleKeyDown(keyevent('keydown', {code: 'AltRight', key: 'Alt', location: 2, timeStamp: Date.now()})); - expect(kbd.onkeyevent).to.have.been.calledOnce; - expect(kbd.onkeyevent).to.have.been.calledWith(0xfe03, 'AltRight', true); - - // Check that the timer is properly dead - kbd.onkeyevent.reset(); - this.clock.tick(100); - expect(kbd.onkeyevent).to.not.have.been.called; - }); - - it('should generate Ctrl, Alt for slow Ctrl+Alt sequence', function () { - const kbd = new Keyboard(document); - kbd.onkeyevent = sinon.spy(); - kbd._handleKeyDown(keyevent('keydown', {code: 'ControlLeft', key: 'Control', location: 1, timeStamp: Date.now()})); - this.clock.tick(60); - kbd._handleKeyDown(keyevent('keydown', {code: 'AltRight', key: 'Alt', location: 2, timeStamp: Date.now()})); - expect(kbd.onkeyevent).to.have.been.calledTwice; - expect(kbd.onkeyevent.firstCall).to.have.been.calledWith(0xffe3, "ControlLeft", true); - expect(kbd.onkeyevent.secondCall).to.have.been.calledWith(0xffea, "AltRight", true); - - // Check that the timer is properly dead - kbd.onkeyevent.reset(); - this.clock.tick(100); - expect(kbd.onkeyevent).to.not.have.been.called; - }); - - it('should pass through single Alt', function () { - const kbd = new Keyboard(document); - kbd.onkeyevent = sinon.spy(); - kbd._handleKeyDown(keyevent('keydown', {code: 'AltRight', key: 'Alt', location: 2})); - expect(kbd.onkeyevent).to.have.been.calledOnce; - expect(kbd.onkeyevent).to.have.been.calledWith(0xffea, 'AltRight', true); - }); - - it('should pass through single AltGr', function () { - const kbd = new Keyboard(document); - kbd.onkeyevent = sinon.spy(); - kbd._handleKeyDown(keyevent('keydown', {code: 'AltRight', key: 'AltGraph', location: 2})); - expect(kbd.onkeyevent).to.have.been.calledOnce; - expect(kbd.onkeyevent).to.have.been.calledWith(0xfe03, 'AltRight', true); - }); - }); -}); diff --git a/systemvm/agent/noVNC/tests/test.localization.js b/systemvm/agent/noVNC/tests/test.localization.js deleted file mode 100644 index 9570c1798a9d..000000000000 --- a/systemvm/agent/noVNC/tests/test.localization.js +++ /dev/null @@ -1,72 +0,0 @@ -const expect = chai.expect; -import { l10n } from '../app/localization.js'; - -describe('Localization', function () { - "use strict"; - - describe('language selection', function () { - let origNavigator; - beforeEach(function () { - // window.navigator is a protected read-only property in many - // environments, so we need to redefine it whilst running these - // tests. - origNavigator = Object.getOwnPropertyDescriptor(window, "navigator"); - if (origNavigator === undefined) { - // Object.getOwnPropertyDescriptor() doesn't work - // properly in any version of IE - this.skip(); - } - - Object.defineProperty(window, "navigator", {value: {}}); - if (window.navigator.languages !== undefined) { - // Object.defineProperty() doesn't work properly in old - // versions of Chrome - this.skip(); - } - - window.navigator.languages = []; - }); - afterEach(function () { - Object.defineProperty(window, "navigator", origNavigator); - }); - - it('should use English by default', function () { - expect(l10n.language).to.equal('en'); - }); - it('should use English if no user language matches', function () { - window.navigator.languages = ["nl", "de"]; - l10n.setup(["es", "fr"]); - expect(l10n.language).to.equal('en'); - }); - it('should use the most preferred user language', function () { - window.navigator.languages = ["nl", "de", "fr"]; - l10n.setup(["es", "fr", "de"]); - expect(l10n.language).to.equal('de'); - }); - it('should prefer sub-languages languages', function () { - window.navigator.languages = ["pt-BR"]; - l10n.setup(["pt", "pt-BR"]); - expect(l10n.language).to.equal('pt-BR'); - }); - it('should fall back to language "parents"', function () { - window.navigator.languages = ["pt-BR"]; - l10n.setup(["fr", "pt", "de"]); - expect(l10n.language).to.equal('pt'); - }); - it('should not use specific language when user asks for a generic language', function () { - window.navigator.languages = ["pt", "de"]; - l10n.setup(["fr", "pt-BR", "de"]); - expect(l10n.language).to.equal('de'); - }); - it('should handle underscore as a separator', function () { - window.navigator.languages = ["pt-BR"]; - l10n.setup(["pt_BR"]); - expect(l10n.language).to.equal('pt_BR'); - }); - it('should handle difference in case', function () { - window.navigator.languages = ["pt-br"]; - l10n.setup(["pt-BR"]); - expect(l10n.language).to.equal('pt-BR'); - }); - }); -}); diff --git a/systemvm/agent/noVNC/tests/test.mouse.js b/systemvm/agent/noVNC/tests/test.mouse.js deleted file mode 100644 index 78c74f157244..000000000000 --- a/systemvm/agent/noVNC/tests/test.mouse.js +++ /dev/null @@ -1,304 +0,0 @@ -const expect = chai.expect; - -import Mouse from '../core/input/mouse.js'; - -describe('Mouse Event Handling', function () { - "use strict"; - - let target; - - beforeEach(function () { - // For these tests we can assume that the canvas is 100x100 - // located at coordinates 10x10 - target = document.createElement('canvas'); - target.style.position = "absolute"; - target.style.top = "10px"; - target.style.left = "10px"; - target.style.width = "100px"; - target.style.height = "100px"; - document.body.appendChild(target); - }); - afterEach(function () { - document.body.removeChild(target); - target = null; - }); - - // The real constructors might not work everywhere we - // want to run these tests - const mouseevent = (typeArg, MouseEventInit) => { - const e = { type: typeArg }; - for (let key in MouseEventInit) { - e[key] = MouseEventInit[key]; - } - e.stopPropagation = sinon.spy(); - e.preventDefault = sinon.spy(); - return e; - }; - const touchevent = mouseevent; - - describe('Decode Mouse Events', function () { - it('should decode mousedown events', function (done) { - const mouse = new Mouse(target); - mouse.onmousebutton = (x, y, down, bmask) => { - expect(bmask).to.be.equal(0x01); - expect(down).to.be.equal(1); - done(); - }; - mouse._handleMouseDown(mouseevent('mousedown', { button: '0x01' })); - }); - it('should decode mouseup events', function (done) { - let calls = 0; - const mouse = new Mouse(target); - mouse.onmousebutton = (x, y, down, bmask) => { - expect(bmask).to.be.equal(0x01); - if (calls++ === 1) { - expect(down).to.not.be.equal(1); - done(); - } - }; - mouse._handleMouseDown(mouseevent('mousedown', { button: '0x01' })); - mouse._handleMouseUp(mouseevent('mouseup', { button: '0x01' })); - }); - it('should decode mousemove events', function (done) { - const mouse = new Mouse(target); - mouse.onmousemove = (x, y) => { - // Note that target relative coordinates are sent - expect(x).to.be.equal(40); - expect(y).to.be.equal(10); - done(); - }; - mouse._handleMouseMove(mouseevent('mousemove', - { clientX: 50, clientY: 20 })); - }); - it('should decode mousewheel events', function (done) { - let calls = 0; - const mouse = new Mouse(target); - mouse.onmousebutton = (x, y, down, bmask) => { - calls++; - expect(bmask).to.be.equal(1<<6); - if (calls === 1) { - expect(down).to.be.equal(1); - } else if (calls === 2) { - expect(down).to.not.be.equal(1); - done(); - } - }; - mouse._handleMouseWheel(mouseevent('mousewheel', - { deltaX: 50, deltaY: 0, - deltaMode: 0})); - }); - }); - - describe('Double-click for Touch', function () { - - beforeEach(function () { this.clock = sinon.useFakeTimers(); }); - afterEach(function () { this.clock.restore(); }); - - it('should use same pos for 2nd tap if close enough', function (done) { - let calls = 0; - const mouse = new Mouse(target); - mouse.onmousebutton = (x, y, down, bmask) => { - calls++; - if (calls === 1) { - expect(down).to.be.equal(1); - expect(x).to.be.equal(68); - expect(y).to.be.equal(36); - } else if (calls === 3) { - expect(down).to.be.equal(1); - expect(x).to.be.equal(68); - expect(y).to.be.equal(36); - done(); - } - }; - // touch events are sent in an array of events - // with one item for each touch point - mouse._handleMouseDown(touchevent( - 'touchstart', { touches: [{ clientX: 78, clientY: 46 }]})); - this.clock.tick(10); - mouse._handleMouseUp(touchevent( - 'touchend', { touches: [{ clientX: 79, clientY: 45 }]})); - this.clock.tick(200); - mouse._handleMouseDown(touchevent( - 'touchstart', { touches: [{ clientX: 67, clientY: 35 }]})); - this.clock.tick(10); - mouse._handleMouseUp(touchevent( - 'touchend', { touches: [{ clientX: 66, clientY: 36 }]})); - }); - - it('should not modify 2nd tap pos if far apart', function (done) { - let calls = 0; - const mouse = new Mouse(target); - mouse.onmousebutton = (x, y, down, bmask) => { - calls++; - if (calls === 1) { - expect(down).to.be.equal(1); - expect(x).to.be.equal(68); - expect(y).to.be.equal(36); - } else if (calls === 3) { - expect(down).to.be.equal(1); - expect(x).to.not.be.equal(68); - expect(y).to.not.be.equal(36); - done(); - } - }; - mouse._handleMouseDown(touchevent( - 'touchstart', { touches: [{ clientX: 78, clientY: 46 }]})); - this.clock.tick(10); - mouse._handleMouseUp(touchevent( - 'touchend', { touches: [{ clientX: 79, clientY: 45 }]})); - this.clock.tick(200); - mouse._handleMouseDown(touchevent( - 'touchstart', { touches: [{ clientX: 57, clientY: 35 }]})); - this.clock.tick(10); - mouse._handleMouseUp(touchevent( - 'touchend', { touches: [{ clientX: 56, clientY: 36 }]})); - }); - - it('should not modify 2nd tap pos if not soon enough', function (done) { - let calls = 0; - const mouse = new Mouse(target); - mouse.onmousebutton = (x, y, down, bmask) => { - calls++; - if (calls === 1) { - expect(down).to.be.equal(1); - expect(x).to.be.equal(68); - expect(y).to.be.equal(36); - } else if (calls === 3) { - expect(down).to.be.equal(1); - expect(x).to.not.be.equal(68); - expect(y).to.not.be.equal(36); - done(); - } - }; - mouse._handleMouseDown(touchevent( - 'touchstart', { touches: [{ clientX: 78, clientY: 46 }]})); - this.clock.tick(10); - mouse._handleMouseUp(touchevent( - 'touchend', { touches: [{ clientX: 79, clientY: 45 }]})); - this.clock.tick(500); - mouse._handleMouseDown(touchevent( - 'touchstart', { touches: [{ clientX: 67, clientY: 35 }]})); - this.clock.tick(10); - mouse._handleMouseUp(touchevent( - 'touchend', { touches: [{ clientX: 66, clientY: 36 }]})); - }); - - it('should not modify 2nd tap pos if not touch', function (done) { - let calls = 0; - const mouse = new Mouse(target); - mouse.onmousebutton = (x, y, down, bmask) => { - calls++; - if (calls === 1) { - expect(down).to.be.equal(1); - expect(x).to.be.equal(68); - expect(y).to.be.equal(36); - } else if (calls === 3) { - expect(down).to.be.equal(1); - expect(x).to.not.be.equal(68); - expect(y).to.not.be.equal(36); - done(); - } - }; - mouse._handleMouseDown(mouseevent( - 'mousedown', { button: '0x01', clientX: 78, clientY: 46 })); - this.clock.tick(10); - mouse._handleMouseUp(mouseevent( - 'mouseup', { button: '0x01', clientX: 79, clientY: 45 })); - this.clock.tick(200); - mouse._handleMouseDown(mouseevent( - 'mousedown', { button: '0x01', clientX: 67, clientY: 35 })); - this.clock.tick(10); - mouse._handleMouseUp(mouseevent( - 'mouseup', { button: '0x01', clientX: 66, clientY: 36 })); - }); - - }); - - describe('Accumulate mouse wheel events with small delta', function () { - - beforeEach(function () { this.clock = sinon.useFakeTimers(); }); - afterEach(function () { this.clock.restore(); }); - - it('should accumulate wheel events if small enough', function () { - const mouse = new Mouse(target); - mouse.onmousebutton = sinon.spy(); - - mouse._handleMouseWheel(mouseevent( - 'mousewheel', { clientX: 18, clientY: 40, - deltaX: 4, deltaY: 0, deltaMode: 0 })); - this.clock.tick(10); - mouse._handleMouseWheel(mouseevent( - 'mousewheel', { clientX: 18, clientY: 40, - deltaX: 4, deltaY: 0, deltaMode: 0 })); - - // threshold is 10 - expect(mouse._accumulatedWheelDeltaX).to.be.equal(8); - - this.clock.tick(10); - mouse._handleMouseWheel(mouseevent( - 'mousewheel', { clientX: 18, clientY: 40, - deltaX: 4, deltaY: 0, deltaMode: 0 })); - - expect(mouse.onmousebutton).to.have.callCount(2); // mouse down and up - - this.clock.tick(10); - mouse._handleMouseWheel(mouseevent( - 'mousewheel', { clientX: 18, clientY: 40, - deltaX: 4, deltaY: 9, deltaMode: 0 })); - - expect(mouse._accumulatedWheelDeltaX).to.be.equal(4); - expect(mouse._accumulatedWheelDeltaY).to.be.equal(9); - - expect(mouse.onmousebutton).to.have.callCount(2); // still - }); - - it('should not accumulate large wheel events', function () { - const mouse = new Mouse(target); - mouse.onmousebutton = sinon.spy(); - - mouse._handleMouseWheel(mouseevent( - 'mousewheel', { clientX: 18, clientY: 40, - deltaX: 11, deltaY: 0, deltaMode: 0 })); - this.clock.tick(10); - mouse._handleMouseWheel(mouseevent( - 'mousewheel', { clientX: 18, clientY: 40, - deltaX: 0, deltaY: 70, deltaMode: 0 })); - this.clock.tick(10); - mouse._handleMouseWheel(mouseevent( - 'mousewheel', { clientX: 18, clientY: 40, - deltaX: 400, deltaY: 400, deltaMode: 0 })); - - expect(mouse.onmousebutton).to.have.callCount(8); // mouse down and up - }); - - it('should send even small wheel events after a timeout', function () { - const mouse = new Mouse(target); - mouse.onmousebutton = sinon.spy(); - - mouse._handleMouseWheel(mouseevent( - 'mousewheel', { clientX: 18, clientY: 40, - deltaX: 1, deltaY: 0, deltaMode: 0 })); - this.clock.tick(51); // timeout on 50 ms - - expect(mouse.onmousebutton).to.have.callCount(2); // mouse down and up - }); - - it('should account for non-zero deltaMode', function () { - const mouse = new Mouse(target); - mouse.onmousebutton = sinon.spy(); - - mouse._handleMouseWheel(mouseevent( - 'mousewheel', { clientX: 18, clientY: 40, - deltaX: 0, deltaY: 2, deltaMode: 1 })); - - this.clock.tick(10); - - mouse._handleMouseWheel(mouseevent( - 'mousewheel', { clientX: 18, clientY: 40, - deltaX: 1, deltaY: 0, deltaMode: 2 })); - - expect(mouse.onmousebutton).to.have.callCount(4); // mouse down and up - }); - }); - -}); diff --git a/systemvm/agent/noVNC/tests/test.rfb.js b/systemvm/agent/noVNC/tests/test.rfb.js deleted file mode 100644 index 99c9c90c8ff0..000000000000 --- a/systemvm/agent/noVNC/tests/test.rfb.js +++ /dev/null @@ -1,2389 +0,0 @@ -const expect = chai.expect; - -import RFB from '../core/rfb.js'; -import Websock from '../core/websock.js'; -import { encodings } from '../core/encodings.js'; - -import FakeWebSocket from './fake.websocket.js'; - -/* UIEvent constructor polyfill for IE */ -(() => { - if (typeof window.UIEvent === "function") return; - - function UIEvent( event, params ) { - params = params || { bubbles: false, cancelable: false, view: window, detail: undefined }; - const evt = document.createEvent( 'UIEvent' ); - evt.initUIEvent( event, params.bubbles, params.cancelable, params.view, params.detail ); - return evt; - } - - UIEvent.prototype = window.UIEvent.prototype; - - window.UIEvent = UIEvent; -})(); - -function push8(arr, num) { - "use strict"; - arr.push(num & 0xFF); -} - -function push16(arr, num) { - "use strict"; - arr.push((num >> 8) & 0xFF, - num & 0xFF); -} - -function push32(arr, num) { - "use strict"; - arr.push((num >> 24) & 0xFF, - (num >> 16) & 0xFF, - (num >> 8) & 0xFF, - num & 0xFF); -} - -describe('Remote Frame Buffer Protocol Client', function () { - let clock; - let raf; - - before(FakeWebSocket.replace); - after(FakeWebSocket.restore); - - before(function () { - this.clock = clock = sinon.useFakeTimers(); - // sinon doesn't support this yet - raf = window.requestAnimationFrame; - window.requestAnimationFrame = setTimeout; - // Use a single set of buffers instead of reallocating to - // speed up tests - const sock = new Websock(); - const _sQ = new Uint8Array(sock._sQbufferSize); - const rQ = new Uint8Array(sock._rQbufferSize); - - Websock.prototype._old_allocate_buffers = Websock.prototype._allocate_buffers; - Websock.prototype._allocate_buffers = function () { - this._sQ = _sQ; - this._rQ = rQ; - }; - - }); - - after(function () { - Websock.prototype._allocate_buffers = Websock.prototype._old_allocate_buffers; - this.clock.restore(); - window.requestAnimationFrame = raf; - }); - - let container; - let rfbs; - - beforeEach(function () { - // Create a container element for all RFB objects to attach to - container = document.createElement('div'); - container.style.width = "100%"; - container.style.height = "100%"; - document.body.appendChild(container); - - // And track all created RFB objects - rfbs = []; - }); - afterEach(function () { - // Make sure every created RFB object is properly cleaned up - // or they might affect subsequent tests - rfbs.forEach(function (rfb) { - rfb.disconnect(); - expect(rfb._disconnect).to.have.been.called; - }); - rfbs = []; - - document.body.removeChild(container); - container = null; - }); - - function make_rfb(url, options) { - url = url || 'wss://host:8675'; - const rfb = new RFB(container, url, options); - clock.tick(); - rfb._sock._websocket._open(); - rfb._rfb_connection_state = 'connected'; - sinon.spy(rfb, "_disconnect"); - rfbs.push(rfb); - return rfb; - } - - describe('Connecting/Disconnecting', function () { - describe('#RFB', function () { - it('should set the current state to "connecting"', function () { - const client = new RFB(document.createElement('div'), 'wss://host:8675'); - client._rfb_connection_state = ''; - this.clock.tick(); - expect(client._rfb_connection_state).to.equal('connecting'); - }); - - it('should actually connect to the websocket', function () { - const client = new RFB(document.createElement('div'), 'ws://HOST:8675/PATH'); - sinon.spy(client._sock, 'open'); - this.clock.tick(); - expect(client._sock.open).to.have.been.calledOnce; - expect(client._sock.open).to.have.been.calledWith('ws://HOST:8675/PATH'); - }); - }); - - describe('#disconnect', function () { - let client; - beforeEach(function () { - client = make_rfb(); - }); - - it('should go to state "disconnecting" before "disconnected"', function () { - sinon.spy(client, '_updateConnectionState'); - client.disconnect(); - expect(client._updateConnectionState).to.have.been.calledTwice; - expect(client._updateConnectionState.getCall(0).args[0]) - .to.equal('disconnecting'); - expect(client._updateConnectionState.getCall(1).args[0]) - .to.equal('disconnected'); - expect(client._rfb_connection_state).to.equal('disconnected'); - }); - - it('should unregister error event handler', function () { - sinon.spy(client._sock, 'off'); - client.disconnect(); - expect(client._sock.off).to.have.been.calledWith('error'); - }); - - it('should unregister message event handler', function () { - sinon.spy(client._sock, 'off'); - client.disconnect(); - expect(client._sock.off).to.have.been.calledWith('message'); - }); - - it('should unregister open event handler', function () { - sinon.spy(client._sock, 'off'); - client.disconnect(); - expect(client._sock.off).to.have.been.calledWith('open'); - }); - }); - - describe('#sendCredentials', function () { - let client; - beforeEach(function () { - client = make_rfb(); - client._rfb_connection_state = 'connecting'; - }); - - it('should set the rfb credentials properly"', function () { - client.sendCredentials({ password: 'pass' }); - expect(client._rfb_credentials).to.deep.equal({ password: 'pass' }); - }); - - it('should call init_msg "soon"', function () { - client._init_msg = sinon.spy(); - client.sendCredentials({ password: 'pass' }); - this.clock.tick(5); - expect(client._init_msg).to.have.been.calledOnce; - }); - }); - }); - - describe('Public API Basic Behavior', function () { - let client; - beforeEach(function () { - client = make_rfb(); - }); - - describe('#sendCtrlAlDel', function () { - it('should sent ctrl[down]-alt[down]-del[down] then del[up]-alt[up]-ctrl[up]', function () { - const expected = {_sQ: new Uint8Array(48), _sQlen: 0, flush: () => {}}; - RFB.messages.keyEvent(expected, 0xFFE3, 1); - RFB.messages.keyEvent(expected, 0xFFE9, 1); - RFB.messages.keyEvent(expected, 0xFFFF, 1); - RFB.messages.keyEvent(expected, 0xFFFF, 0); - RFB.messages.keyEvent(expected, 0xFFE9, 0); - RFB.messages.keyEvent(expected, 0xFFE3, 0); - - client.sendCtrlAltDel(); - expect(client._sock).to.have.sent(expected._sQ); - }); - - it('should not send the keys if we are not in a normal state', function () { - sinon.spy(client._sock, 'flush'); - client._rfb_connection_state = "connecting"; - client.sendCtrlAltDel(); - expect(client._sock.flush).to.not.have.been.called; - }); - - it('should not send the keys if we are set as view_only', function () { - sinon.spy(client._sock, 'flush'); - client._viewOnly = true; - client.sendCtrlAltDel(); - expect(client._sock.flush).to.not.have.been.called; - }); - }); - - describe('#sendKey', function () { - it('should send a single key with the given code and state (down = true)', function () { - const expected = {_sQ: new Uint8Array(8), _sQlen: 0, flush: () => {}}; - RFB.messages.keyEvent(expected, 123, 1); - client.sendKey(123, 'Key123', true); - expect(client._sock).to.have.sent(expected._sQ); - }); - - it('should send both a down and up event if the state is not specified', function () { - const expected = {_sQ: new Uint8Array(16), _sQlen: 0, flush: () => {}}; - RFB.messages.keyEvent(expected, 123, 1); - RFB.messages.keyEvent(expected, 123, 0); - client.sendKey(123, 'Key123'); - expect(client._sock).to.have.sent(expected._sQ); - }); - - it('should not send the key if we are not in a normal state', function () { - sinon.spy(client._sock, 'flush'); - client._rfb_connection_state = "connecting"; - client.sendKey(123, 'Key123'); - expect(client._sock.flush).to.not.have.been.called; - }); - - it('should not send the key if we are set as view_only', function () { - sinon.spy(client._sock, 'flush'); - client._viewOnly = true; - client.sendKey(123, 'Key123'); - expect(client._sock.flush).to.not.have.been.called; - }); - - it('should send QEMU extended events if supported', function () { - client._qemuExtKeyEventSupported = true; - const expected = {_sQ: new Uint8Array(12), _sQlen: 0, flush: () => {}}; - RFB.messages.QEMUExtendedKeyEvent(expected, 0x20, true, 0x0039); - client.sendKey(0x20, 'Space', true); - expect(client._sock).to.have.sent(expected._sQ); - }); - - it('should not send QEMU extended events if unknown key code', function () { - client._qemuExtKeyEventSupported = true; - const expected = {_sQ: new Uint8Array(8), _sQlen: 0, flush: () => {}}; - RFB.messages.keyEvent(expected, 123, 1); - client.sendKey(123, 'FooBar', true); - expect(client._sock).to.have.sent(expected._sQ); - }); - }); - - describe('#focus', function () { - it('should move focus to canvas object', function () { - client._canvas.focus = sinon.spy(); - client.focus(); - expect(client._canvas.focus).to.have.been.called.once; - }); - }); - - describe('#blur', function () { - it('should remove focus from canvas object', function () { - client._canvas.blur = sinon.spy(); - client.blur(); - expect(client._canvas.blur).to.have.been.called.once; - }); - }); - - describe('#clipboardPasteFrom', function () { - it('should send the given text in a paste event', function () { - const expected = {_sQ: new Uint8Array(11), _sQlen: 0, - _sQbufferSize: 11, flush: () => {}}; - RFB.messages.clientCutText(expected, 'abc'); - client.clipboardPasteFrom('abc'); - expect(client._sock).to.have.sent(expected._sQ); - }); - - it('should flush multiple times for large clipboards', function () { - sinon.spy(client._sock, 'flush'); - let long_text = ""; - for (let i = 0; i < client._sock._sQbufferSize + 100; i++) { - long_text += 'a'; - } - client.clipboardPasteFrom(long_text); - expect(client._sock.flush).to.have.been.calledTwice; - }); - - it('should not send the text if we are not in a normal state', function () { - sinon.spy(client._sock, 'flush'); - client._rfb_connection_state = "connecting"; - client.clipboardPasteFrom('abc'); - expect(client._sock.flush).to.not.have.been.called; - }); - }); - - describe("XVP operations", function () { - beforeEach(function () { - client._rfb_xvp_ver = 1; - }); - - it('should send the shutdown signal on #machineShutdown', function () { - client.machineShutdown(); - expect(client._sock).to.have.sent(new Uint8Array([0xFA, 0x00, 0x01, 0x02])); - }); - - it('should send the reboot signal on #machineReboot', function () { - client.machineReboot(); - expect(client._sock).to.have.sent(new Uint8Array([0xFA, 0x00, 0x01, 0x03])); - }); - - it('should send the reset signal on #machineReset', function () { - client.machineReset(); - expect(client._sock).to.have.sent(new Uint8Array([0xFA, 0x00, 0x01, 0x04])); - }); - - it('should not send XVP operations with higher versions than we support', function () { - sinon.spy(client._sock, 'flush'); - client._xvpOp(2, 7); - expect(client._sock.flush).to.not.have.been.called; - }); - }); - }); - - describe('Clipping', function () { - let client; - beforeEach(function () { - client = make_rfb(); - container.style.width = '70px'; - container.style.height = '80px'; - client.clipViewport = true; - }); - - it('should update display clip state when changing the property', function () { - const spy = sinon.spy(client._display, "clipViewport", ["set"]); - - client.clipViewport = false; - expect(spy.set).to.have.been.calledOnce; - expect(spy.set).to.have.been.calledWith(false); - spy.set.reset(); - - client.clipViewport = true; - expect(spy.set).to.have.been.calledOnce; - expect(spy.set).to.have.been.calledWith(true); - }); - - it('should update the viewport when the container size changes', function () { - sinon.spy(client._display, "viewportChangeSize"); - - container.style.width = '40px'; - container.style.height = '50px'; - const event = new UIEvent('resize'); - window.dispatchEvent(event); - clock.tick(); - - expect(client._display.viewportChangeSize).to.have.been.calledOnce; - expect(client._display.viewportChangeSize).to.have.been.calledWith(40, 50); - }); - - it('should update the viewport when the remote session resizes', function () { - // Simple ExtendedDesktopSize FBU message - const incoming = [ 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, - 0x00, 0xff, 0x00, 0xff, 0xff, 0xff, 0xfe, 0xcc, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff, - 0x00, 0x00, 0x00, 0x00 ]; - - sinon.spy(client._display, "viewportChangeSize"); - - client._sock._websocket._receive_data(new Uint8Array(incoming)); - - // FIXME: Display implicitly calls viewportChangeSize() when - // resizing the framebuffer, hence calledTwice. - expect(client._display.viewportChangeSize).to.have.been.calledTwice; - expect(client._display.viewportChangeSize).to.have.been.calledWith(70, 80); - }); - - it('should not update the viewport if not clipping', function () { - client.clipViewport = false; - sinon.spy(client._display, "viewportChangeSize"); - - container.style.width = '40px'; - container.style.height = '50px'; - const event = new UIEvent('resize'); - window.dispatchEvent(event); - clock.tick(); - - expect(client._display.viewportChangeSize).to.not.have.been.called; - }); - - it('should not update the viewport if scaling', function () { - client.scaleViewport = true; - sinon.spy(client._display, "viewportChangeSize"); - - container.style.width = '40px'; - container.style.height = '50px'; - const event = new UIEvent('resize'); - window.dispatchEvent(event); - clock.tick(); - - expect(client._display.viewportChangeSize).to.not.have.been.called; - }); - - describe('Dragging', function () { - beforeEach(function () { - client.dragViewport = true; - sinon.spy(RFB.messages, "pointerEvent"); - }); - - afterEach(function () { - RFB.messages.pointerEvent.restore(); - }); - - it('should not send button messages when initiating viewport dragging', function () { - client._handleMouseButton(13, 9, 0x001); - expect(RFB.messages.pointerEvent).to.not.have.been.called; - }); - - it('should send button messages when release without movement', function () { - // Just up and down - client._handleMouseButton(13, 9, 0x001); - client._handleMouseButton(13, 9, 0x000); - expect(RFB.messages.pointerEvent).to.have.been.calledTwice; - - RFB.messages.pointerEvent.reset(); - - // Small movement - client._handleMouseButton(13, 9, 0x001); - client._handleMouseMove(15, 14); - client._handleMouseButton(15, 14, 0x000); - expect(RFB.messages.pointerEvent).to.have.been.calledTwice; - }); - - it('should send button message directly when drag is disabled', function () { - client.dragViewport = false; - client._handleMouseButton(13, 9, 0x001); - expect(RFB.messages.pointerEvent).to.have.been.calledOnce; - }); - - it('should be initiate viewport dragging on sufficient movement', function () { - sinon.spy(client._display, "viewportChangePos"); - - // Too small movement - - client._handleMouseButton(13, 9, 0x001); - client._handleMouseMove(18, 9); - - expect(RFB.messages.pointerEvent).to.not.have.been.called; - expect(client._display.viewportChangePos).to.not.have.been.called; - - // Sufficient movement - - client._handleMouseMove(43, 9); - - expect(RFB.messages.pointerEvent).to.not.have.been.called; - expect(client._display.viewportChangePos).to.have.been.calledOnce; - expect(client._display.viewportChangePos).to.have.been.calledWith(-30, 0); - - client._display.viewportChangePos.reset(); - - // Now a small movement should move right away - - client._handleMouseMove(43, 14); - - expect(RFB.messages.pointerEvent).to.not.have.been.called; - expect(client._display.viewportChangePos).to.have.been.calledOnce; - expect(client._display.viewportChangePos).to.have.been.calledWith(0, -5); - }); - - it('should not send button messages when dragging ends', function () { - // First the movement - - client._handleMouseButton(13, 9, 0x001); - client._handleMouseMove(43, 9); - client._handleMouseButton(43, 9, 0x000); - - expect(RFB.messages.pointerEvent).to.not.have.been.called; - }); - - it('should terminate viewport dragging on a button up event', function () { - // First the dragging movement - - client._handleMouseButton(13, 9, 0x001); - client._handleMouseMove(43, 9); - client._handleMouseButton(43, 9, 0x000); - - // Another movement now should not move the viewport - - sinon.spy(client._display, "viewportChangePos"); - - client._handleMouseMove(43, 59); - - expect(client._display.viewportChangePos).to.not.have.been.called; - }); - }); - }); - - describe('Scaling', function () { - let client; - beforeEach(function () { - client = make_rfb(); - container.style.width = '70px'; - container.style.height = '80px'; - client.scaleViewport = true; - }); - - it('should update display scale factor when changing the property', function () { - const spy = sinon.spy(client._display, "scale", ["set"]); - sinon.spy(client._display, "autoscale"); - - client.scaleViewport = false; - expect(spy.set).to.have.been.calledOnce; - expect(spy.set).to.have.been.calledWith(1.0); - expect(client._display.autoscale).to.not.have.been.called; - - client.scaleViewport = true; - expect(client._display.autoscale).to.have.been.calledOnce; - expect(client._display.autoscale).to.have.been.calledWith(70, 80); - }); - - it('should update the clipping setting when changing the property', function () { - client.clipViewport = true; - - const spy = sinon.spy(client._display, "clipViewport", ["set"]); - - client.scaleViewport = false; - expect(spy.set).to.have.been.calledOnce; - expect(spy.set).to.have.been.calledWith(true); - - spy.set.reset(); - - client.scaleViewport = true; - expect(spy.set).to.have.been.calledOnce; - expect(spy.set).to.have.been.calledWith(false); - }); - - it('should update the scaling when the container size changes', function () { - sinon.spy(client._display, "autoscale"); - - container.style.width = '40px'; - container.style.height = '50px'; - const event = new UIEvent('resize'); - window.dispatchEvent(event); - clock.tick(); - - expect(client._display.autoscale).to.have.been.calledOnce; - expect(client._display.autoscale).to.have.been.calledWith(40, 50); - }); - - it('should update the scaling when the remote session resizes', function () { - // Simple ExtendedDesktopSize FBU message - const incoming = [ 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, - 0x00, 0xff, 0x00, 0xff, 0xff, 0xff, 0xfe, 0xcc, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff, - 0x00, 0x00, 0x00, 0x00 ]; - - sinon.spy(client._display, "autoscale"); - - client._sock._websocket._receive_data(new Uint8Array(incoming)); - - expect(client._display.autoscale).to.have.been.calledOnce; - expect(client._display.autoscale).to.have.been.calledWith(70, 80); - }); - - it('should not update the display scale factor if not scaling', function () { - client.scaleViewport = false; - - sinon.spy(client._display, "autoscale"); - - container.style.width = '40px'; - container.style.height = '50px'; - const event = new UIEvent('resize'); - window.dispatchEvent(event); - clock.tick(); - - expect(client._display.autoscale).to.not.have.been.called; - }); - }); - - describe('Remote resize', function () { - let client; - beforeEach(function () { - client = make_rfb(); - client._supportsSetDesktopSize = true; - client.resizeSession = true; - container.style.width = '70px'; - container.style.height = '80px'; - sinon.spy(RFB.messages, "setDesktopSize"); - }); - - afterEach(function () { - RFB.messages.setDesktopSize.restore(); - }); - - it('should only request a resize when turned on', function () { - client.resizeSession = false; - expect(RFB.messages.setDesktopSize).to.not.have.been.called; - client.resizeSession = true; - expect(RFB.messages.setDesktopSize).to.have.been.calledOnce; - }); - - it('should request a resize when initially connecting', function () { - // Simple ExtendedDesktopSize FBU message - const incoming = [ 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x04, 0x00, 0x04, 0xff, 0xff, 0xfe, 0xcc, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x04, - 0x00, 0x00, 0x00, 0x00 ]; - - // First message should trigger a resize - - client._supportsSetDesktopSize = false; - - client._sock._websocket._receive_data(new Uint8Array(incoming)); - - expect(RFB.messages.setDesktopSize).to.have.been.calledOnce; - expect(RFB.messages.setDesktopSize).to.have.been.calledWith(sinon.match.object, 70, 80, 0, 0); - - RFB.messages.setDesktopSize.reset(); - - // Second message should not trigger a resize - - client._sock._websocket._receive_data(new Uint8Array(incoming)); - - expect(RFB.messages.setDesktopSize).to.not.have.been.called; - }); - - it('should request a resize when the container resizes', function () { - container.style.width = '40px'; - container.style.height = '50px'; - const event = new UIEvent('resize'); - window.dispatchEvent(event); - clock.tick(1000); - - expect(RFB.messages.setDesktopSize).to.have.been.calledOnce; - expect(RFB.messages.setDesktopSize).to.have.been.calledWith(sinon.match.object, 40, 50, 0, 0); - }); - - it('should not resize until the container size is stable', function () { - container.style.width = '20px'; - container.style.height = '30px'; - const event1 = new UIEvent('resize'); - window.dispatchEvent(event1); - clock.tick(400); - - expect(RFB.messages.setDesktopSize).to.not.have.been.called; - - container.style.width = '40px'; - container.style.height = '50px'; - const event2 = new UIEvent('resize'); - window.dispatchEvent(event2); - clock.tick(400); - - expect(RFB.messages.setDesktopSize).to.not.have.been.called; - - clock.tick(200); - - expect(RFB.messages.setDesktopSize).to.have.been.calledOnce; - expect(RFB.messages.setDesktopSize).to.have.been.calledWith(sinon.match.object, 40, 50, 0, 0); - }); - - it('should not resize when resize is disabled', function () { - client._resizeSession = false; - - container.style.width = '40px'; - container.style.height = '50px'; - const event = new UIEvent('resize'); - window.dispatchEvent(event); - clock.tick(1000); - - expect(RFB.messages.setDesktopSize).to.not.have.been.called; - }); - - it('should not resize when resize is not supported', function () { - client._supportsSetDesktopSize = false; - - container.style.width = '40px'; - container.style.height = '50px'; - const event = new UIEvent('resize'); - window.dispatchEvent(event); - clock.tick(1000); - - expect(RFB.messages.setDesktopSize).to.not.have.been.called; - }); - - it('should not resize when in view only mode', function () { - client._viewOnly = true; - - container.style.width = '40px'; - container.style.height = '50px'; - const event = new UIEvent('resize'); - window.dispatchEvent(event); - clock.tick(1000); - - expect(RFB.messages.setDesktopSize).to.not.have.been.called; - }); - - it('should not try to override a server resize', function () { - // Simple ExtendedDesktopSize FBU message - const incoming = [ 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x04, 0x00, 0x04, 0xff, 0xff, 0xfe, 0xcc, - 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x04, - 0x00, 0x00, 0x00, 0x00 ]; - - client._sock._websocket._receive_data(new Uint8Array(incoming)); - - expect(RFB.messages.setDesktopSize).to.not.have.been.called; - }); - }); - - describe('Misc Internals', function () { - describe('#_updateConnectionState', function () { - let client; - beforeEach(function () { - client = make_rfb(); - }); - - it('should clear the disconnect timer if the state is not "disconnecting"', function () { - const spy = sinon.spy(); - client._disconnTimer = setTimeout(spy, 50); - client._rfb_connection_state = 'connecting'; - client._updateConnectionState('connected'); - this.clock.tick(51); - expect(spy).to.not.have.been.called; - expect(client._disconnTimer).to.be.null; - }); - - it('should set the rfb_connection_state', function () { - client._rfb_connection_state = 'connecting'; - client._updateConnectionState('connected'); - expect(client._rfb_connection_state).to.equal('connected'); - }); - - it('should not change the state when we are disconnected', function () { - client.disconnect(); - expect(client._rfb_connection_state).to.equal('disconnected'); - client._updateConnectionState('connecting'); - expect(client._rfb_connection_state).to.not.equal('connecting'); - }); - - it('should ignore state changes to the same state', function () { - const connectSpy = sinon.spy(); - client.addEventListener("connect", connectSpy); - - expect(client._rfb_connection_state).to.equal('connected'); - client._updateConnectionState('connected'); - expect(connectSpy).to.not.have.been.called; - - client.disconnect(); - - const disconnectSpy = sinon.spy(); - client.addEventListener("disconnect", disconnectSpy); - - expect(client._rfb_connection_state).to.equal('disconnected'); - client._updateConnectionState('disconnected'); - expect(disconnectSpy).to.not.have.been.called; - }); - - it('should ignore illegal state changes', function () { - const spy = sinon.spy(); - client.addEventListener("disconnect", spy); - client._updateConnectionState('disconnected'); - expect(client._rfb_connection_state).to.not.equal('disconnected'); - expect(spy).to.not.have.been.called; - }); - }); - - describe('#_fail', function () { - let client; - beforeEach(function () { - client = make_rfb(); - }); - - it('should close the WebSocket connection', function () { - sinon.spy(client._sock, 'close'); - client._fail(); - expect(client._sock.close).to.have.been.calledOnce; - }); - - it('should transition to disconnected', function () { - sinon.spy(client, '_updateConnectionState'); - client._fail(); - this.clock.tick(2000); - expect(client._updateConnectionState).to.have.been.called; - expect(client._rfb_connection_state).to.equal('disconnected'); - }); - - it('should set clean_disconnect variable', function () { - client._rfb_clean_disconnect = true; - client._rfb_connection_state = 'connected'; - client._fail(); - expect(client._rfb_clean_disconnect).to.be.false; - }); - - it('should result in disconnect event with clean set to false', function () { - client._rfb_connection_state = 'connected'; - const spy = sinon.spy(); - client.addEventListener("disconnect", spy); - client._fail(); - this.clock.tick(2000); - expect(spy).to.have.been.calledOnce; - expect(spy.args[0][0].detail.clean).to.be.false; - }); - - }); - }); - - describe('Connection States', function () { - describe('connecting', function () { - it('should open the websocket connection', function () { - const client = new RFB(document.createElement('div'), - 'ws://HOST:8675/PATH'); - sinon.spy(client._sock, 'open'); - this.clock.tick(); - expect(client._sock.open).to.have.been.calledOnce; - }); - }); - - describe('connected', function () { - let client; - beforeEach(function () { - client = make_rfb(); - }); - - it('should result in a connect event if state becomes connected', function () { - const spy = sinon.spy(); - client.addEventListener("connect", spy); - client._rfb_connection_state = 'connecting'; - client._updateConnectionState('connected'); - expect(spy).to.have.been.calledOnce; - }); - - it('should not result in a connect event if the state is not "connected"', function () { - const spy = sinon.spy(); - client.addEventListener("connect", spy); - client._sock._websocket.open = () => {}; // explicitly don't call onopen - client._updateConnectionState('connecting'); - expect(spy).to.not.have.been.called; - }); - }); - - describe('disconnecting', function () { - let client; - beforeEach(function () { - client = make_rfb(); - }); - - it('should force disconnect if we do not call Websock.onclose within the disconnection timeout', function () { - sinon.spy(client, '_updateConnectionState'); - client._sock._websocket.close = () => {}; // explicitly don't call onclose - client._updateConnectionState('disconnecting'); - this.clock.tick(3 * 1000); - expect(client._updateConnectionState).to.have.been.calledTwice; - expect(client._rfb_disconnect_reason).to.not.equal(""); - expect(client._rfb_connection_state).to.equal("disconnected"); - }); - - it('should not fail if Websock.onclose gets called within the disconnection timeout', function () { - client._updateConnectionState('disconnecting'); - this.clock.tick(3 * 1000 / 2); - client._sock._websocket.close(); - this.clock.tick(3 * 1000 / 2 + 1); - expect(client._rfb_connection_state).to.equal('disconnected'); - }); - - it('should close the WebSocket connection', function () { - sinon.spy(client._sock, 'close'); - client._updateConnectionState('disconnecting'); - expect(client._sock.close).to.have.been.calledOnce; - }); - - it('should not result in a disconnect event', function () { - const spy = sinon.spy(); - client.addEventListener("disconnect", spy); - client._sock._websocket.close = () => {}; // explicitly don't call onclose - client._updateConnectionState('disconnecting'); - expect(spy).to.not.have.been.called; - }); - }); - - describe('disconnected', function () { - let client; - beforeEach(function () { - client = new RFB(document.createElement('div'), 'ws://HOST:8675/PATH'); - }); - - it('should result in a disconnect event if state becomes "disconnected"', function () { - const spy = sinon.spy(); - client.addEventListener("disconnect", spy); - client._rfb_connection_state = 'disconnecting'; - client._updateConnectionState('disconnected'); - expect(spy).to.have.been.calledOnce; - expect(spy.args[0][0].detail.clean).to.be.true; - }); - - it('should result in a disconnect event without msg when no reason given', function () { - const spy = sinon.spy(); - client.addEventListener("disconnect", spy); - client._rfb_connection_state = 'disconnecting'; - client._rfb_disconnect_reason = ""; - client._updateConnectionState('disconnected'); - expect(spy).to.have.been.calledOnce; - expect(spy.args[0].length).to.equal(1); - }); - }); - }); - - describe('Protocol Initialization States', function () { - let client; - beforeEach(function () { - client = make_rfb(); - client._rfb_connection_state = 'connecting'; - }); - - describe('ProtocolVersion', function () { - function send_ver(ver, client) { - const arr = new Uint8Array(12); - for (let i = 0; i < ver.length; i++) { - arr[i+4] = ver.charCodeAt(i); - } - arr[0] = 'R'; arr[1] = 'F'; arr[2] = 'B'; arr[3] = ' '; - arr[11] = '\n'; - client._sock._websocket._receive_data(arr); - } - - describe('version parsing', function () { - it('should interpret version 003.003 as version 3.3', function () { - send_ver('003.003', client); - expect(client._rfb_version).to.equal(3.3); - }); - - it('should interpret version 003.006 as version 3.3', function () { - send_ver('003.006', client); - expect(client._rfb_version).to.equal(3.3); - }); - - it('should interpret version 003.889 as version 3.3', function () { - send_ver('003.889', client); - expect(client._rfb_version).to.equal(3.3); - }); - - it('should interpret version 003.007 as version 3.7', function () { - send_ver('003.007', client); - expect(client._rfb_version).to.equal(3.7); - }); - - it('should interpret version 003.008 as version 3.8', function () { - send_ver('003.008', client); - expect(client._rfb_version).to.equal(3.8); - }); - - it('should interpret version 004.000 as version 3.8', function () { - send_ver('004.000', client); - expect(client._rfb_version).to.equal(3.8); - }); - - it('should interpret version 004.001 as version 3.8', function () { - send_ver('004.001', client); - expect(client._rfb_version).to.equal(3.8); - }); - - it('should interpret version 005.000 as version 3.8', function () { - send_ver('005.000', client); - expect(client._rfb_version).to.equal(3.8); - }); - - it('should fail on an invalid version', function () { - sinon.spy(client, "_fail"); - send_ver('002.000', client); - expect(client._fail).to.have.been.calledOnce; - }); - }); - - it('should send back the interpreted version', function () { - send_ver('004.000', client); - - const expected_str = 'RFB 003.008\n'; - const expected = []; - for (let i = 0; i < expected_str.length; i++) { - expected[i] = expected_str.charCodeAt(i); - } - - expect(client._sock).to.have.sent(new Uint8Array(expected)); - }); - - it('should transition to the Security state on successful negotiation', function () { - send_ver('003.008', client); - expect(client._rfb_init_state).to.equal('Security'); - }); - - describe('Repeater', function () { - beforeEach(function () { - client = make_rfb('wss://host:8675', { repeaterID: "12345" }); - client._rfb_connection_state = 'connecting'; - }); - - it('should interpret version 000.000 as a repeater', function () { - send_ver('000.000', client); - expect(client._rfb_version).to.equal(0); - - const sent_data = client._sock._websocket._get_sent_data(); - expect(new Uint8Array(sent_data.buffer, 0, 9)).to.array.equal(new Uint8Array([73, 68, 58, 49, 50, 51, 52, 53, 0])); - expect(sent_data).to.have.length(250); - }); - - it('should handle two step repeater negotiation', function () { - send_ver('000.000', client); - send_ver('003.008', client); - expect(client._rfb_version).to.equal(3.8); - }); - }); - }); - - describe('Security', function () { - beforeEach(function () { - client._rfb_init_state = 'Security'; - }); - - it('should simply receive the auth scheme when for versions < 3.7', function () { - client._rfb_version = 3.6; - const auth_scheme_raw = [1, 2, 3, 4]; - const auth_scheme = (auth_scheme_raw[0] << 24) + (auth_scheme_raw[1] << 16) + - (auth_scheme_raw[2] << 8) + auth_scheme_raw[3]; - client._sock._websocket._receive_data(new Uint8Array(auth_scheme_raw)); - expect(client._rfb_auth_scheme).to.equal(auth_scheme); - }); - - it('should prefer no authentication is possible', function () { - client._rfb_version = 3.7; - const auth_schemes = [2, 1, 3]; - client._sock._websocket._receive_data(new Uint8Array(auth_schemes)); - expect(client._rfb_auth_scheme).to.equal(1); - expect(client._sock).to.have.sent(new Uint8Array([1, 1])); - }); - - it('should choose for the most prefered scheme possible for versions >= 3.7', function () { - client._rfb_version = 3.7; - const auth_schemes = [2, 22, 16]; - client._sock._websocket._receive_data(new Uint8Array(auth_schemes)); - expect(client._rfb_auth_scheme).to.equal(22); - expect(client._sock).to.have.sent(new Uint8Array([22])); - }); - - it('should fail if there are no supported schemes for versions >= 3.7', function () { - sinon.spy(client, "_fail"); - client._rfb_version = 3.7; - const auth_schemes = [1, 32]; - client._sock._websocket._receive_data(new Uint8Array(auth_schemes)); - expect(client._fail).to.have.been.calledOnce; - }); - - it('should fail with the appropriate message if no types are sent for versions >= 3.7', function () { - client._rfb_version = 3.7; - const failure_data = [0, 0, 0, 0, 6, 119, 104, 111, 111, 112, 115]; - sinon.spy(client, '_fail'); - client._sock._websocket._receive_data(new Uint8Array(failure_data)); - - expect(client._fail).to.have.been.calledOnce; - expect(client._fail).to.have.been.calledWith( - 'Security negotiation failed on no security types (reason: whoops)'); - }); - - it('should transition to the Authentication state and continue on successful negotiation', function () { - client._rfb_version = 3.7; - const auth_schemes = [1, 1]; - client._negotiate_authentication = sinon.spy(); - client._sock._websocket._receive_data(new Uint8Array(auth_schemes)); - expect(client._rfb_init_state).to.equal('Authentication'); - expect(client._negotiate_authentication).to.have.been.calledOnce; - }); - }); - - describe('Authentication', function () { - beforeEach(function () { - client._rfb_init_state = 'Security'; - }); - - function send_security(type, cl) { - cl._sock._websocket._receive_data(new Uint8Array([1, type])); - } - - it('should fail on auth scheme 0 (pre 3.7) with the given message', function () { - client._rfb_version = 3.6; - const err_msg = "Whoopsies"; - const data = [0, 0, 0, 0]; - const err_len = err_msg.length; - push32(data, err_len); - for (let i = 0; i < err_len; i++) { - data.push(err_msg.charCodeAt(i)); - } - - sinon.spy(client, '_fail'); - client._sock._websocket._receive_data(new Uint8Array(data)); - expect(client._fail).to.have.been.calledWith( - 'Security negotiation failed on authentication scheme (reason: Whoopsies)'); - }); - - it('should transition straight to SecurityResult on "no auth" (1) for versions >= 3.8', function () { - client._rfb_version = 3.8; - send_security(1, client); - expect(client._rfb_init_state).to.equal('SecurityResult'); - }); - - it('should transition straight to ServerInitialisation on "no auth" for versions < 3.8', function () { - client._rfb_version = 3.7; - send_security(1, client); - expect(client._rfb_init_state).to.equal('ServerInitialisation'); - }); - - it('should fail on an unknown auth scheme', function () { - sinon.spy(client, "_fail"); - client._rfb_version = 3.8; - send_security(57, client); - expect(client._fail).to.have.been.calledOnce; - }); - - describe('VNC Authentication (type 2) Handler', function () { - beforeEach(function () { - client._rfb_init_state = 'Security'; - client._rfb_version = 3.8; - }); - - it('should fire the credentialsrequired event if missing a password', function () { - const spy = sinon.spy(); - client.addEventListener("credentialsrequired", spy); - send_security(2, client); - - const challenge = []; - for (let i = 0; i < 16; i++) { challenge[i] = i; } - client._sock._websocket._receive_data(new Uint8Array(challenge)); - - expect(client._rfb_credentials).to.be.empty; - expect(spy).to.have.been.calledOnce; - expect(spy.args[0][0].detail.types).to.have.members(["password"]); - }); - - it('should encrypt the password with DES and then send it back', function () { - client._rfb_credentials = { password: 'passwd' }; - send_security(2, client); - client._sock._websocket._get_sent_data(); // skip the choice of auth reply - - const challenge = []; - for (let i = 0; i < 16; i++) { challenge[i] = i; } - client._sock._websocket._receive_data(new Uint8Array(challenge)); - - const des_pass = RFB.genDES('passwd', challenge); - expect(client._sock).to.have.sent(new Uint8Array(des_pass)); - }); - - it('should transition to SecurityResult immediately after sending the password', function () { - client._rfb_credentials = { password: 'passwd' }; - send_security(2, client); - - const challenge = []; - for (let i = 0; i < 16; i++) { challenge[i] = i; } - client._sock._websocket._receive_data(new Uint8Array(challenge)); - - expect(client._rfb_init_state).to.equal('SecurityResult'); - }); - }); - - describe('XVP Authentication (type 22) Handler', function () { - beforeEach(function () { - client._rfb_init_state = 'Security'; - client._rfb_version = 3.8; - }); - - it('should fall through to standard VNC authentication upon completion', function () { - client._rfb_credentials = { username: 'user', - target: 'target', - password: 'password' }; - client._negotiate_std_vnc_auth = sinon.spy(); - send_security(22, client); - expect(client._negotiate_std_vnc_auth).to.have.been.calledOnce; - }); - - it('should fire the credentialsrequired event if all credentials are missing', function () { - const spy = sinon.spy(); - client.addEventListener("credentialsrequired", spy); - client._rfb_credentials = {}; - send_security(22, client); - - expect(client._rfb_credentials).to.be.empty; - expect(spy).to.have.been.calledOnce; - expect(spy.args[0][0].detail.types).to.have.members(["username", "password", "target"]); - }); - - it('should fire the credentialsrequired event if some credentials are missing', function () { - const spy = sinon.spy(); - client.addEventListener("credentialsrequired", spy); - client._rfb_credentials = { username: 'user', - target: 'target' }; - send_security(22, client); - - expect(spy).to.have.been.calledOnce; - expect(spy.args[0][0].detail.types).to.have.members(["username", "password", "target"]); - }); - - it('should send user and target separately', function () { - client._rfb_credentials = { username: 'user', - target: 'target', - password: 'password' }; - client._negotiate_std_vnc_auth = sinon.spy(); - - send_security(22, client); - - const expected = [22, 4, 6]; // auth selection, len user, len target - for (let i = 0; i < 10; i++) { expected[i+3] = 'usertarget'.charCodeAt(i); } - - expect(client._sock).to.have.sent(new Uint8Array(expected)); - }); - }); - - describe('TightVNC Authentication (type 16) Handler', function () { - beforeEach(function () { - client._rfb_init_state = 'Security'; - client._rfb_version = 3.8; - send_security(16, client); - client._sock._websocket._get_sent_data(); // skip the security reply - }); - - function send_num_str_pairs(pairs, client) { - const data = []; - push32(data, pairs.length); - - for (let i = 0; i < pairs.length; i++) { - push32(data, pairs[i][0]); - for (let j = 0; j < 4; j++) { - data.push(pairs[i][1].charCodeAt(j)); - } - for (let j = 0; j < 8; j++) { - data.push(pairs[i][2].charCodeAt(j)); - } - } - - client._sock._websocket._receive_data(new Uint8Array(data)); - } - - it('should skip tunnel negotiation if no tunnels are requested', function () { - client._sock._websocket._receive_data(new Uint8Array([0, 0, 0, 0])); - expect(client._rfb_tightvnc).to.be.true; - }); - - it('should fail if no supported tunnels are listed', function () { - sinon.spy(client, "_fail"); - send_num_str_pairs([[123, 'OTHR', 'SOMETHNG']], client); - expect(client._fail).to.have.been.calledOnce; - }); - - it('should choose the notunnel tunnel type', function () { - send_num_str_pairs([[0, 'TGHT', 'NOTUNNEL'], [123, 'OTHR', 'SOMETHNG']], client); - expect(client._sock).to.have.sent(new Uint8Array([0, 0, 0, 0])); - }); - - it('should choose the notunnel tunnel type for Siemens devices', function () { - send_num_str_pairs([[1, 'SICR', 'SCHANNEL'], [2, 'SICR', 'SCHANLPW']], client); - expect(client._sock).to.have.sent(new Uint8Array([0, 0, 0, 0])); - }); - - it('should continue to sub-auth negotiation after tunnel negotiation', function () { - send_num_str_pairs([[0, 'TGHT', 'NOTUNNEL']], client); - client._sock._websocket._get_sent_data(); // skip the tunnel choice here - send_num_str_pairs([[1, 'STDV', 'NOAUTH__']], client); - expect(client._sock).to.have.sent(new Uint8Array([0, 0, 0, 1])); - expect(client._rfb_init_state).to.equal('SecurityResult'); - }); - - /*it('should attempt to use VNC auth over no auth when possible', function () { - client._rfb_tightvnc = true; - client._negotiate_std_vnc_auth = sinon.spy(); - send_num_str_pairs([[1, 'STDV', 'NOAUTH__'], [2, 'STDV', 'VNCAUTH_']], client); - expect(client._sock).to.have.sent([0, 0, 0, 1]); - expect(client._negotiate_std_vnc_auth).to.have.been.calledOnce; - expect(client._rfb_auth_scheme).to.equal(2); - });*/ // while this would make sense, the original code doesn't actually do this - - it('should accept the "no auth" auth type and transition to SecurityResult', function () { - client._rfb_tightvnc = true; - send_num_str_pairs([[1, 'STDV', 'NOAUTH__']], client); - expect(client._sock).to.have.sent(new Uint8Array([0, 0, 0, 1])); - expect(client._rfb_init_state).to.equal('SecurityResult'); - }); - - it('should accept VNC authentication and transition to that', function () { - client._rfb_tightvnc = true; - client._negotiate_std_vnc_auth = sinon.spy(); - send_num_str_pairs([[2, 'STDV', 'VNCAUTH__']], client); - expect(client._sock).to.have.sent(new Uint8Array([0, 0, 0, 2])); - expect(client._negotiate_std_vnc_auth).to.have.been.calledOnce; - expect(client._rfb_auth_scheme).to.equal(2); - }); - - it('should fail if there are no supported auth types', function () { - sinon.spy(client, "_fail"); - client._rfb_tightvnc = true; - send_num_str_pairs([[23, 'stdv', 'badval__']], client); - expect(client._fail).to.have.been.calledOnce; - }); - }); - }); - - describe('SecurityResult', function () { - beforeEach(function () { - client._rfb_init_state = 'SecurityResult'; - }); - - it('should fall through to ServerInitialisation on a response code of 0', function () { - client._sock._websocket._receive_data(new Uint8Array([0, 0, 0, 0])); - expect(client._rfb_init_state).to.equal('ServerInitialisation'); - }); - - it('should fail on an error code of 1 with the given message for versions >= 3.8', function () { - client._rfb_version = 3.8; - sinon.spy(client, '_fail'); - const failure_data = [0, 0, 0, 1, 0, 0, 0, 6, 119, 104, 111, 111, 112, 115]; - client._sock._websocket._receive_data(new Uint8Array(failure_data)); - expect(client._fail).to.have.been.calledWith( - 'Security negotiation failed on security result (reason: whoops)'); - }); - - it('should fail on an error code of 1 with a standard message for version < 3.8', function () { - sinon.spy(client, '_fail'); - client._rfb_version = 3.7; - client._sock._websocket._receive_data(new Uint8Array([0, 0, 0, 1])); - expect(client._fail).to.have.been.calledWith( - 'Security handshake failed'); - }); - - it('should result in securityfailure event when receiving a non zero status', function () { - const spy = sinon.spy(); - client.addEventListener("securityfailure", spy); - client._sock._websocket._receive_data(new Uint8Array([0, 0, 0, 2])); - expect(spy).to.have.been.calledOnce; - expect(spy.args[0][0].detail.status).to.equal(2); - }); - - it('should include reason when provided in securityfailure event', function () { - client._rfb_version = 3.8; - const spy = sinon.spy(); - client.addEventListener("securityfailure", spy); - const failure_data = [0, 0, 0, 1, 0, 0, 0, 12, 115, 117, 99, 104, - 32, 102, 97, 105, 108, 117, 114, 101]; - client._sock._websocket._receive_data(new Uint8Array(failure_data)); - expect(spy.args[0][0].detail.status).to.equal(1); - expect(spy.args[0][0].detail.reason).to.equal('such failure'); - }); - - it('should not include reason when length is zero in securityfailure event', function () { - client._rfb_version = 3.9; - const spy = sinon.spy(); - client.addEventListener("securityfailure", spy); - const failure_data = [0, 0, 0, 1, 0, 0, 0, 0]; - client._sock._websocket._receive_data(new Uint8Array(failure_data)); - expect(spy.args[0][0].detail.status).to.equal(1); - expect('reason' in spy.args[0][0].detail).to.be.false; - }); - - it('should not include reason in securityfailure event for version < 3.8', function () { - client._rfb_version = 3.6; - const spy = sinon.spy(); - client.addEventListener("securityfailure", spy); - client._sock._websocket._receive_data(new Uint8Array([0, 0, 0, 2])); - expect(spy.args[0][0].detail.status).to.equal(2); - expect('reason' in spy.args[0][0].detail).to.be.false; - }); - }); - - describe('ClientInitialisation', function () { - it('should transition to the ServerInitialisation state', function () { - const client = make_rfb(); - client._rfb_connection_state = 'connecting'; - client._rfb_init_state = 'SecurityResult'; - client._sock._websocket._receive_data(new Uint8Array([0, 0, 0, 0])); - expect(client._rfb_init_state).to.equal('ServerInitialisation'); - }); - - it('should send 1 if we are in shared mode', function () { - const client = make_rfb('wss://host:8675', { shared: true }); - client._rfb_connection_state = 'connecting'; - client._rfb_init_state = 'SecurityResult'; - client._sock._websocket._receive_data(new Uint8Array([0, 0, 0, 0])); - expect(client._sock).to.have.sent(new Uint8Array([1])); - }); - - it('should send 0 if we are not in shared mode', function () { - const client = make_rfb('wss://host:8675', { shared: false }); - client._rfb_connection_state = 'connecting'; - client._rfb_init_state = 'SecurityResult'; - client._sock._websocket._receive_data(new Uint8Array([0, 0, 0, 0])); - expect(client._sock).to.have.sent(new Uint8Array([0])); - }); - }); - - describe('ServerInitialisation', function () { - beforeEach(function () { - client._rfb_init_state = 'ServerInitialisation'; - }); - - function send_server_init(opts, client) { - const full_opts = { width: 10, height: 12, bpp: 24, depth: 24, big_endian: 0, - true_color: 1, red_max: 255, green_max: 255, blue_max: 255, - red_shift: 16, green_shift: 8, blue_shift: 0, name: 'a name' }; - for (let opt in opts) { - full_opts[opt] = opts[opt]; - } - const data = []; - - push16(data, full_opts.width); - push16(data, full_opts.height); - - data.push(full_opts.bpp); - data.push(full_opts.depth); - data.push(full_opts.big_endian); - data.push(full_opts.true_color); - - push16(data, full_opts.red_max); - push16(data, full_opts.green_max); - push16(data, full_opts.blue_max); - push8(data, full_opts.red_shift); - push8(data, full_opts.green_shift); - push8(data, full_opts.blue_shift); - - // padding - push8(data, 0); - push8(data, 0); - push8(data, 0); - - client._sock._websocket._receive_data(new Uint8Array(data)); - - const name_data = []; - push32(name_data, full_opts.name.length); - for (let i = 0; i < full_opts.name.length; i++) { - name_data.push(full_opts.name.charCodeAt(i)); - } - client._sock._websocket._receive_data(new Uint8Array(name_data)); - } - - it('should set the framebuffer width and height', function () { - send_server_init({ width: 32, height: 84 }, client); - expect(client._fb_width).to.equal(32); - expect(client._fb_height).to.equal(84); - }); - - // NB(sross): we just warn, not fail, for endian-ness and shifts, so we don't test them - - it('should set the framebuffer name and call the callback', function () { - const spy = sinon.spy(); - client.addEventListener("desktopname", spy); - send_server_init({ name: 'some name' }, client); - - expect(client._fb_name).to.equal('some name'); - expect(spy).to.have.been.calledOnce; - expect(spy.args[0][0].detail.name).to.equal('some name'); - }); - - it('should handle the extended init message of the tight encoding', function () { - // NB(sross): we don't actually do anything with it, so just test that we can - // read it w/o throwing an error - client._rfb_tightvnc = true; - send_server_init({}, client); - - const tight_data = []; - push16(tight_data, 1); - push16(tight_data, 2); - push16(tight_data, 3); - push16(tight_data, 0); - for (let i = 0; i < 16 + 32 + 48; i++) { - tight_data.push(i); - } - client._sock._websocket._receive_data(new Uint8Array(tight_data)); - - expect(client._rfb_connection_state).to.equal('connected'); - }); - - it('should resize the display', function () { - sinon.spy(client._display, 'resize'); - send_server_init({ width: 27, height: 32 }, client); - - expect(client._display.resize).to.have.been.calledOnce; - expect(client._display.resize).to.have.been.calledWith(27, 32); - }); - - it('should grab the mouse and keyboard', function () { - sinon.spy(client._keyboard, 'grab'); - sinon.spy(client._mouse, 'grab'); - send_server_init({}, client); - expect(client._keyboard.grab).to.have.been.calledOnce; - expect(client._mouse.grab).to.have.been.calledOnce; - }); - - describe('Initial Update Request', function () { - beforeEach(function () { - sinon.spy(RFB.messages, "pixelFormat"); - sinon.spy(RFB.messages, "clientEncodings"); - sinon.spy(RFB.messages, "fbUpdateRequest"); - }); - - afterEach(function () { - RFB.messages.pixelFormat.restore(); - RFB.messages.clientEncodings.restore(); - RFB.messages.fbUpdateRequest.restore(); - }); - - // TODO(directxman12): test the various options in this configuration matrix - it('should reply with the pixel format, client encodings, and initial update request', function () { - send_server_init({ width: 27, height: 32 }, client); - - expect(RFB.messages.pixelFormat).to.have.been.calledOnce; - expect(RFB.messages.pixelFormat).to.have.been.calledWith(client._sock, 24, true); - expect(RFB.messages.pixelFormat).to.have.been.calledBefore(RFB.messages.clientEncodings); - expect(RFB.messages.clientEncodings).to.have.been.calledOnce; - expect(RFB.messages.clientEncodings.getCall(0).args[1]).to.include(encodings.encodingTight); - expect(RFB.messages.clientEncodings).to.have.been.calledBefore(RFB.messages.fbUpdateRequest); - expect(RFB.messages.fbUpdateRequest).to.have.been.calledOnce; - expect(RFB.messages.fbUpdateRequest).to.have.been.calledWith(client._sock, false, 0, 0, 27, 32); - }); - - it('should reply with restricted settings for Intel AMT servers', function () { - send_server_init({ width: 27, height: 32, name: "Intel(r) AMT KVM"}, client); - - expect(RFB.messages.pixelFormat).to.have.been.calledOnce; - expect(RFB.messages.pixelFormat).to.have.been.calledWith(client._sock, 8, true); - expect(RFB.messages.pixelFormat).to.have.been.calledBefore(RFB.messages.clientEncodings); - expect(RFB.messages.clientEncodings).to.have.been.calledOnce; - expect(RFB.messages.clientEncodings.getCall(0).args[1]).to.not.include(encodings.encodingTight); - expect(RFB.messages.clientEncodings.getCall(0).args[1]).to.not.include(encodings.encodingHextile); - expect(RFB.messages.clientEncodings).to.have.been.calledBefore(RFB.messages.fbUpdateRequest); - expect(RFB.messages.fbUpdateRequest).to.have.been.calledOnce; - expect(RFB.messages.fbUpdateRequest).to.have.been.calledWith(client._sock, false, 0, 0, 27, 32); - }); - }); - - it('should transition to the "connected" state', function () { - send_server_init({}, client); - expect(client._rfb_connection_state).to.equal('connected'); - }); - }); - }); - - describe('Protocol Message Processing After Completing Initialization', function () { - let client; - - beforeEach(function () { - client = make_rfb(); - client._fb_name = 'some device'; - client._fb_width = 640; - client._fb_height = 20; - }); - - describe('Framebuffer Update Handling', function () { - const target_data_arr = [ - 0xff, 0x00, 0x00, 255, 0x00, 0xff, 0x00, 255, 0x00, 0x00, 0xff, 255, 0x00, 0x00, 0xff, 255, - 0x00, 0xff, 0x00, 255, 0xff, 0x00, 0x00, 255, 0x00, 0x00, 0xff, 255, 0x00, 0x00, 0xff, 255, - 0xee, 0x00, 0xff, 255, 0x00, 0xee, 0xff, 255, 0xaa, 0xee, 0xff, 255, 0xab, 0xee, 0xff, 255, - 0xee, 0x00, 0xff, 255, 0x00, 0xee, 0xff, 255, 0xaa, 0xee, 0xff, 255, 0xab, 0xee, 0xff, 255 - ]; - let target_data; - - const target_data_check_arr = [ - 0x00, 0x00, 0xff, 255, 0x00, 0x00, 0xff, 255, 0x00, 0xff, 0x00, 255, 0x00, 0xff, 0x00, 255, - 0x00, 0x00, 0xff, 255, 0x00, 0x00, 0xff, 255, 0x00, 0xff, 0x00, 255, 0x00, 0xff, 0x00, 255, - 0x00, 0xff, 0x00, 255, 0x00, 0xff, 0x00, 255, 0x00, 0x00, 0xff, 255, 0x00, 0x00, 0xff, 255, - 0x00, 0xff, 0x00, 255, 0x00, 0xff, 0x00, 255, 0x00, 0x00, 0xff, 255, 0x00, 0x00, 0xff, 255 - ]; - let target_data_check; - - before(function () { - // NB(directxman12): PhantomJS 1.x doesn't implement Uint8ClampedArray - target_data = new Uint8Array(target_data_arr); - target_data_check = new Uint8Array(target_data_check_arr); - }); - - function send_fbu_msg(rect_info, rect_data, client, rect_cnt) { - let data = []; - - if (!rect_cnt || rect_cnt > -1) { - // header - data.push(0); // msg type - data.push(0); // padding - push16(data, rect_cnt || rect_data.length); - } - - for (let i = 0; i < rect_data.length; i++) { - if (rect_info[i]) { - push16(data, rect_info[i].x); - push16(data, rect_info[i].y); - push16(data, rect_info[i].width); - push16(data, rect_info[i].height); - push32(data, rect_info[i].encoding); - } - data = data.concat(rect_data[i]); - } - - client._sock._websocket._receive_data(new Uint8Array(data)); - } - - it('should send an update request if there is sufficient data', function () { - const expected_msg = {_sQ: new Uint8Array(10), _sQlen: 0, flush: () => {}}; - RFB.messages.fbUpdateRequest(expected_msg, true, 0, 0, 640, 20); - - client._framebufferUpdate = () => true; - client._sock._websocket._receive_data(new Uint8Array([0])); - - expect(client._sock).to.have.sent(expected_msg._sQ); - }); - - it('should not send an update request if we need more data', function () { - client._sock._websocket._receive_data(new Uint8Array([0])); - expect(client._sock._websocket._get_sent_data()).to.have.length(0); - }); - - it('should resume receiving an update if we previously did not have enough data', function () { - const expected_msg = {_sQ: new Uint8Array(10), _sQlen: 0, flush: () => {}}; - RFB.messages.fbUpdateRequest(expected_msg, true, 0, 0, 640, 20); - - // just enough to set FBU.rects - client._sock._websocket._receive_data(new Uint8Array([0, 0, 0, 3])); - expect(client._sock._websocket._get_sent_data()).to.have.length(0); - - client._framebufferUpdate = function () { this._sock.rQskipBytes(1); return true; }; // we magically have enough data - // 247 should *not* be used as the message type here - client._sock._websocket._receive_data(new Uint8Array([247])); - expect(client._sock).to.have.sent(expected_msg._sQ); - }); - - it('should not send a request in continuous updates mode', function () { - client._enabledContinuousUpdates = true; - client._framebufferUpdate = () => true; - client._sock._websocket._receive_data(new Uint8Array([0])); - - expect(client._sock._websocket._get_sent_data()).to.have.length(0); - }); - - it('should fail on an unsupported encoding', function () { - sinon.spy(client, "_fail"); - const rect_info = { x: 8, y: 11, width: 27, height: 32, encoding: 234 }; - send_fbu_msg([rect_info], [[]], client); - expect(client._fail).to.have.been.calledOnce; - }); - - it('should be able to pause and resume receiving rects if not enought data', function () { - // seed some initial data to copy - client._fb_width = 4; - client._fb_height = 4; - client._display.resize(4, 4); - client._display.blitRgbxImage(0, 0, 4, 2, new Uint8Array(target_data_check_arr.slice(0, 32)), 0); - - const info = [{ x: 0, y: 2, width: 2, height: 2, encoding: 0x01}, - { x: 2, y: 2, width: 2, height: 2, encoding: 0x01}]; - // data says [{ old_x: 2, old_y: 0 }, { old_x: 0, old_y: 0 }] - const rects = [[0, 2, 0, 0], [0, 0, 0, 0]]; - send_fbu_msg([info[0]], [rects[0]], client, 2); - send_fbu_msg([info[1]], [rects[1]], client, -1); - expect(client._display).to.have.displayed(target_data_check); - }); - - describe('Message Encoding Handlers', function () { - beforeEach(function () { - // a really small frame - client._fb_width = 4; - client._fb_height = 4; - client._fb_depth = 24; - client._display.resize(4, 4); - }); - - it('should handle the RAW encoding', function () { - const info = [{ x: 0, y: 0, width: 2, height: 2, encoding: 0x00 }, - { x: 2, y: 0, width: 2, height: 2, encoding: 0x00 }, - { x: 0, y: 2, width: 4, height: 1, encoding: 0x00 }, - { x: 0, y: 3, width: 4, height: 1, encoding: 0x00 }]; - // data is in bgrx - const rects = [ - [0x00, 0x00, 0xff, 0, 0x00, 0xff, 0x00, 0, 0x00, 0xff, 0x00, 0, 0x00, 0x00, 0xff, 0], - [0xff, 0x00, 0x00, 0, 0xff, 0x00, 0x00, 0, 0xff, 0x00, 0x00, 0, 0xff, 0x00, 0x00, 0], - [0xff, 0x00, 0xee, 0, 0xff, 0xee, 0x00, 0, 0xff, 0xee, 0xaa, 0, 0xff, 0xee, 0xab, 0], - [0xff, 0x00, 0xee, 0, 0xff, 0xee, 0x00, 0, 0xff, 0xee, 0xaa, 0, 0xff, 0xee, 0xab, 0]]; - send_fbu_msg(info, rects, client); - expect(client._display).to.have.displayed(target_data); - }); - - it('should handle the RAW encoding in low colour mode', function () { - const info = [{ x: 0, y: 0, width: 2, height: 2, encoding: 0x00 }, - { x: 2, y: 0, width: 2, height: 2, encoding: 0x00 }, - { x: 0, y: 2, width: 4, height: 1, encoding: 0x00 }, - { x: 0, y: 3, width: 4, height: 1, encoding: 0x00 }]; - const rects = [ - [0x03, 0x03, 0x03, 0x03], - [0x0c, 0x0c, 0x0c, 0x0c], - [0x0c, 0x0c, 0x03, 0x03], - [0x0c, 0x0c, 0x03, 0x03]]; - client._fb_depth = 8; - send_fbu_msg(info, rects, client); - expect(client._display).to.have.displayed(target_data_check); - }); - - it('should handle the COPYRECT encoding', function () { - // seed some initial data to copy - client._display.blitRgbxImage(0, 0, 4, 2, new Uint8Array(target_data_check_arr.slice(0, 32)), 0); - - const info = [{ x: 0, y: 2, width: 2, height: 2, encoding: 0x01}, - { x: 2, y: 2, width: 2, height: 2, encoding: 0x01}]; - // data says [{ old_x: 0, old_y: 0 }, { old_x: 0, old_y: 0 }] - const rects = [[0, 2, 0, 0], [0, 0, 0, 0]]; - send_fbu_msg(info, rects, client); - expect(client._display).to.have.displayed(target_data_check); - }); - - // TODO(directxman12): for encodings with subrects, test resuming on partial send? - // TODO(directxman12): test rre_chunk_sz (related to above about subrects)? - - it('should handle the RRE encoding', function () { - const info = [{ x: 0, y: 0, width: 4, height: 4, encoding: 0x02 }]; - const rect = []; - push32(rect, 2); // 2 subrects - push32(rect, 0xff00ff); // becomes 00ff00ff --> #00FF00 bg color - rect.push(0xff); // becomes ff0000ff --> #0000FF color - rect.push(0x00); - rect.push(0x00); - rect.push(0xff); - push16(rect, 0); // x: 0 - push16(rect, 0); // y: 0 - push16(rect, 2); // width: 2 - push16(rect, 2); // height: 2 - rect.push(0xff); // becomes ff0000ff --> #0000FF color - rect.push(0x00); - rect.push(0x00); - rect.push(0xff); - push16(rect, 2); // x: 2 - push16(rect, 2); // y: 2 - push16(rect, 2); // width: 2 - push16(rect, 2); // height: 2 - - send_fbu_msg(info, [rect], client); - expect(client._display).to.have.displayed(target_data_check); - }); - - describe('the HEXTILE encoding handler', function () { - it('should handle a tile with fg, bg specified, normal subrects', function () { - const info = [{ x: 0, y: 0, width: 4, height: 4, encoding: 0x05 }]; - const rect = []; - rect.push(0x02 | 0x04 | 0x08); // bg spec, fg spec, anysubrects - push32(rect, 0xff00ff); // becomes 00ff00ff --> #00FF00 bg color - rect.push(0xff); // becomes ff0000ff --> #0000FF fg color - rect.push(0x00); - rect.push(0x00); - rect.push(0xff); - rect.push(2); // 2 subrects - rect.push(0); // x: 0, y: 0 - rect.push(1 | (1 << 4)); // width: 2, height: 2 - rect.push(2 | (2 << 4)); // x: 2, y: 2 - rect.push(1 | (1 << 4)); // width: 2, height: 2 - send_fbu_msg(info, [rect], client); - expect(client._display).to.have.displayed(target_data_check); - }); - - it('should handle a raw tile', function () { - const info = [{ x: 0, y: 0, width: 4, height: 4, encoding: 0x05 }]; - const rect = []; - rect.push(0x01); // raw - for (let i = 0; i < target_data.length; i += 4) { - rect.push(target_data[i + 2]); - rect.push(target_data[i + 1]); - rect.push(target_data[i]); - rect.push(target_data[i + 3]); - } - send_fbu_msg(info, [rect], client); - expect(client._display).to.have.displayed(target_data); - }); - - it('should handle a tile with only bg specified (solid bg)', function () { - const info = [{ x: 0, y: 0, width: 4, height: 4, encoding: 0x05 }]; - const rect = []; - rect.push(0x02); - push32(rect, 0xff00ff); // becomes 00ff00ff --> #00FF00 bg color - send_fbu_msg(info, [rect], client); - - const expected = []; - for (let i = 0; i < 16; i++) { push32(expected, 0xff00ff); } - expect(client._display).to.have.displayed(new Uint8Array(expected)); - }); - - it('should handle a tile with only bg specified and an empty frame afterwards', function () { - // set the width so we can have two tiles - client._fb_width = 8; - client._display.resize(8, 4); - - const info = [{ x: 0, y: 0, width: 32, height: 4, encoding: 0x05 }]; - - const rect = []; - - // send a bg frame - rect.push(0x02); - push32(rect, 0xff00ff); // becomes 00ff00ff --> #00FF00 bg color - - // send an empty frame - rect.push(0x00); - - send_fbu_msg(info, [rect], client); - - const expected = []; - for (let i = 0; i < 16; i++) { push32(expected, 0xff00ff); } // rect 1: solid - for (let i = 0; i < 16; i++) { push32(expected, 0xff00ff); } // rect 2: same bkground color - expect(client._display).to.have.displayed(new Uint8Array(expected)); - }); - - it('should handle a tile with bg and coloured subrects', function () { - const info = [{ x: 0, y: 0, width: 4, height: 4, encoding: 0x05 }]; - const rect = []; - rect.push(0x02 | 0x08 | 0x10); // bg spec, anysubrects, colouredsubrects - push32(rect, 0xff00ff); // becomes 00ff00ff --> #00FF00 bg color - rect.push(2); // 2 subrects - rect.push(0xff); // becomes ff0000ff --> #0000FF fg color - rect.push(0x00); - rect.push(0x00); - rect.push(0xff); - rect.push(0); // x: 0, y: 0 - rect.push(1 | (1 << 4)); // width: 2, height: 2 - rect.push(0xff); // becomes ff0000ff --> #0000FF fg color - rect.push(0x00); - rect.push(0x00); - rect.push(0xff); - rect.push(2 | (2 << 4)); // x: 2, y: 2 - rect.push(1 | (1 << 4)); // width: 2, height: 2 - send_fbu_msg(info, [rect], client); - expect(client._display).to.have.displayed(target_data_check); - }); - - it('should carry over fg and bg colors from the previous tile if not specified', function () { - client._fb_width = 4; - client._fb_height = 17; - client._display.resize(4, 17); - - const info = [{ x: 0, y: 0, width: 4, height: 17, encoding: 0x05}]; - const rect = []; - rect.push(0x02 | 0x04 | 0x08); // bg spec, fg spec, anysubrects - push32(rect, 0xff00ff); // becomes 00ff00ff --> #00FF00 bg color - rect.push(0xff); // becomes ff0000ff --> #0000FF fg color - rect.push(0x00); - rect.push(0x00); - rect.push(0xff); - rect.push(8); // 8 subrects - for (let i = 0; i < 4; i++) { - rect.push((0 << 4) | (i * 4)); // x: 0, y: i*4 - rect.push(1 | (1 << 4)); // width: 2, height: 2 - rect.push((2 << 4) | (i * 4 + 2)); // x: 2, y: i * 4 + 2 - rect.push(1 | (1 << 4)); // width: 2, height: 2 - } - rect.push(0x08); // anysubrects - rect.push(1); // 1 subrect - rect.push(0); // x: 0, y: 0 - rect.push(1 | (1 << 4)); // width: 2, height: 2 - send_fbu_msg(info, [rect], client); - - let expected = []; - for (let i = 0; i < 4; i++) { expected = expected.concat(target_data_check_arr); } - expected = expected.concat(target_data_check_arr.slice(0, 16)); - expect(client._display).to.have.displayed(new Uint8Array(expected)); - }); - - it('should fail on an invalid subencoding', function () { - sinon.spy(client, "_fail"); - const info = [{ x: 0, y: 0, width: 4, height: 4, encoding: 0x05 }]; - const rects = [[45]]; // an invalid subencoding - send_fbu_msg(info, rects, client); - expect(client._fail).to.have.been.calledOnce; - }); - }); - - it.skip('should handle the TIGHT encoding', function () { - // TODO(directxman12): test this - }); - - it.skip('should handle the TIGHT_PNG encoding', function () { - // TODO(directxman12): test this - }); - - it('should handle the DesktopSize pseduo-encoding', function () { - sinon.spy(client._display, 'resize'); - send_fbu_msg([{ x: 0, y: 0, width: 20, height: 50, encoding: -223 }], [[]], client); - - expect(client._fb_width).to.equal(20); - expect(client._fb_height).to.equal(50); - - expect(client._display.resize).to.have.been.calledOnce; - expect(client._display.resize).to.have.been.calledWith(20, 50); - }); - - describe('the ExtendedDesktopSize pseudo-encoding handler', function () { - beforeEach(function () { - // a really small frame - client._fb_width = 4; - client._fb_height = 4; - client._display.resize(4, 4); - sinon.spy(client._display, 'resize'); - }); - - function make_screen_data(nr_of_screens) { - const data = []; - push8(data, nr_of_screens); // number-of-screens - push8(data, 0); // padding - push16(data, 0); // padding - for (let i=0; i {}}; - const incoming_msg = {_sQ: new Uint8Array(16), _sQlen: 0, flush: () => {}}; - - const payload = "foo\x00ab9"; - - // ClientFence and ServerFence are identical in structure - RFB.messages.clientFence(expected_msg, (1<<0) | (1<<1), payload); - RFB.messages.clientFence(incoming_msg, 0xffffffff, payload); - - client._sock._websocket._receive_data(incoming_msg._sQ); - - expect(client._sock).to.have.sent(expected_msg._sQ); - - expected_msg._sQlen = 0; - incoming_msg._sQlen = 0; - - RFB.messages.clientFence(expected_msg, (1<<0), payload); - RFB.messages.clientFence(incoming_msg, (1<<0) | (1<<31), payload); - - client._sock._websocket._receive_data(incoming_msg._sQ); - - expect(client._sock).to.have.sent(expected_msg._sQ); - }); - - it('should enable continuous updates on first EndOfContinousUpdates', function () { - const expected_msg = {_sQ: new Uint8Array(10), _sQlen: 0, flush: () => {}}; - - RFB.messages.enableContinuousUpdates(expected_msg, true, 0, 0, 640, 20); - - expect(client._enabledContinuousUpdates).to.be.false; - - client._sock._websocket._receive_data(new Uint8Array([150])); - - expect(client._enabledContinuousUpdates).to.be.true; - expect(client._sock).to.have.sent(expected_msg._sQ); - }); - - it('should disable continuous updates on subsequent EndOfContinousUpdates', function () { - client._enabledContinuousUpdates = true; - client._supportsContinuousUpdates = true; - - client._sock._websocket._receive_data(new Uint8Array([150])); - - expect(client._enabledContinuousUpdates).to.be.false; - }); - - it('should update continuous updates on resize', function () { - const expected_msg = {_sQ: new Uint8Array(10), _sQlen: 0, flush: () => {}}; - RFB.messages.enableContinuousUpdates(expected_msg, true, 0, 0, 90, 700); - - client._resize(450, 160); - - expect(client._sock._websocket._get_sent_data()).to.have.length(0); - - client._enabledContinuousUpdates = true; - - client._resize(90, 700); - - expect(client._sock).to.have.sent(expected_msg._sQ); - }); - - it('should fail on an unknown message type', function () { - sinon.spy(client, "_fail"); - client._sock._websocket._receive_data(new Uint8Array([87])); - expect(client._fail).to.have.been.calledOnce; - }); - }); - - describe('Asynchronous Events', function () { - let client; - beforeEach(function () { - client = make_rfb(); - }); - - describe('Mouse event handlers', function () { - it('should not send button messages in view-only mode', function () { - client._viewOnly = true; - sinon.spy(client._sock, 'flush'); - client._handleMouseButton(0, 0, 1, 0x001); - expect(client._sock.flush).to.not.have.been.called; - }); - - it('should not send movement messages in view-only mode', function () { - client._viewOnly = true; - sinon.spy(client._sock, 'flush'); - client._handleMouseMove(0, 0); - expect(client._sock.flush).to.not.have.been.called; - }); - - it('should send a pointer event on mouse button presses', function () { - client._handleMouseButton(10, 12, 1, 0x001); - const pointer_msg = {_sQ: new Uint8Array(6), _sQlen: 0, flush: () => {}}; - RFB.messages.pointerEvent(pointer_msg, 10, 12, 0x001); - expect(client._sock).to.have.sent(pointer_msg._sQ); - }); - - it('should send a mask of 1 on mousedown', function () { - client._handleMouseButton(10, 12, 1, 0x001); - const pointer_msg = {_sQ: new Uint8Array(6), _sQlen: 0, flush: () => {}}; - RFB.messages.pointerEvent(pointer_msg, 10, 12, 0x001); - expect(client._sock).to.have.sent(pointer_msg._sQ); - }); - - it('should send a mask of 0 on mouseup', function () { - client._mouse_buttonMask = 0x001; - client._handleMouseButton(10, 12, 0, 0x001); - const pointer_msg = {_sQ: new Uint8Array(6), _sQlen: 0, flush: () => {}}; - RFB.messages.pointerEvent(pointer_msg, 10, 12, 0x000); - expect(client._sock).to.have.sent(pointer_msg._sQ); - }); - - it('should send a pointer event on mouse movement', function () { - client._handleMouseMove(10, 12); - const pointer_msg = {_sQ: new Uint8Array(6), _sQlen: 0, flush: () => {}}; - RFB.messages.pointerEvent(pointer_msg, 10, 12, 0x000); - expect(client._sock).to.have.sent(pointer_msg._sQ); - }); - - it('should set the button mask so that future mouse movements use it', function () { - client._handleMouseButton(10, 12, 1, 0x010); - client._handleMouseMove(13, 9); - const pointer_msg = {_sQ: new Uint8Array(12), _sQlen: 0, flush: () => {}}; - RFB.messages.pointerEvent(pointer_msg, 10, 12, 0x010); - RFB.messages.pointerEvent(pointer_msg, 13, 9, 0x010); - expect(client._sock).to.have.sent(pointer_msg._sQ); - }); - }); - - describe('Keyboard Event Handlers', function () { - it('should send a key message on a key press', function () { - client._handleKeyEvent(0x41, 'KeyA', true); - const key_msg = {_sQ: new Uint8Array(8), _sQlen: 0, flush: () => {}}; - RFB.messages.keyEvent(key_msg, 0x41, 1); - expect(client._sock).to.have.sent(key_msg._sQ); - }); - - it('should not send messages in view-only mode', function () { - client._viewOnly = true; - sinon.spy(client._sock, 'flush'); - client._handleKeyEvent('a', 'KeyA', true); - expect(client._sock.flush).to.not.have.been.called; - }); - }); - - describe('WebSocket event handlers', function () { - // message events - it('should do nothing if we receive an empty message and have nothing in the queue', function () { - client._normal_msg = sinon.spy(); - client._sock._websocket._receive_data(new Uint8Array([])); - expect(client._normal_msg).to.not.have.been.called; - }); - - it('should handle a message in the connected state as a normal message', function () { - client._normal_msg = sinon.spy(); - client._sock._websocket._receive_data(new Uint8Array([1, 2, 3])); - expect(client._normal_msg).to.have.been.called; - }); - - it('should handle a message in any non-disconnected/failed state like an init message', function () { - client._rfb_connection_state = 'connecting'; - client._rfb_init_state = 'ProtocolVersion'; - client._init_msg = sinon.spy(); - client._sock._websocket._receive_data(new Uint8Array([1, 2, 3])); - expect(client._init_msg).to.have.been.called; - }); - - it('should process all normal messages directly', function () { - const spy = sinon.spy(); - client.addEventListener("bell", spy); - client._sock._websocket._receive_data(new Uint8Array([0x02, 0x02])); - expect(spy).to.have.been.calledTwice; - }); - - // open events - it('should update the state to ProtocolVersion on open (if the state is "connecting")', function () { - client = new RFB(document.createElement('div'), 'wss://host:8675'); - this.clock.tick(); - client._sock._websocket._open(); - expect(client._rfb_init_state).to.equal('ProtocolVersion'); - }); - - it('should fail if we are not currently ready to connect and we get an "open" event', function () { - sinon.spy(client, "_fail"); - client._rfb_connection_state = 'connected'; - client._sock._websocket._open(); - expect(client._fail).to.have.been.calledOnce; - }); - - // close events - it('should transition to "disconnected" from "disconnecting" on a close event', function () { - const real = client._sock._websocket.close; - client._sock._websocket.close = () => {}; - client.disconnect(); - expect(client._rfb_connection_state).to.equal('disconnecting'); - client._sock._websocket.close = real; - client._sock._websocket.close(); - expect(client._rfb_connection_state).to.equal('disconnected'); - }); - - it('should fail if we get a close event while connecting', function () { - sinon.spy(client, "_fail"); - client._rfb_connection_state = 'connecting'; - client._sock._websocket.close(); - expect(client._fail).to.have.been.calledOnce; - }); - - it('should unregister close event handler', function () { - sinon.spy(client._sock, 'off'); - client.disconnect(); - client._sock._websocket.close(); - expect(client._sock.off).to.have.been.calledWith('close'); - }); - - // error events do nothing - }); - }); -}); diff --git a/systemvm/agent/noVNC/tests/test.util.js b/systemvm/agent/noVNC/tests/test.util.js deleted file mode 100644 index 201acc8bb0d2..000000000000 --- a/systemvm/agent/noVNC/tests/test.util.js +++ /dev/null @@ -1,69 +0,0 @@ -/* eslint-disable no-console */ -const expect = chai.expect; - -import * as Log from '../core/util/logging.js'; - -describe('Utils', function () { - "use strict"; - - describe('logging functions', function () { - beforeEach(function () { - sinon.spy(console, 'log'); - sinon.spy(console, 'debug'); - sinon.spy(console, 'warn'); - sinon.spy(console, 'error'); - sinon.spy(console, 'info'); - }); - - afterEach(function () { - console.log.restore(); - console.debug.restore(); - console.warn.restore(); - console.error.restore(); - console.info.restore(); - Log.init_logging(); - }); - - it('should use noop for levels lower than the min level', function () { - Log.init_logging('warn'); - Log.Debug('hi'); - Log.Info('hello'); - expect(console.log).to.not.have.been.called; - }); - - it('should use console.debug for Debug', function () { - Log.init_logging('debug'); - Log.Debug('dbg'); - expect(console.debug).to.have.been.calledWith('dbg'); - }); - - it('should use console.info for Info', function () { - Log.init_logging('debug'); - Log.Info('inf'); - expect(console.info).to.have.been.calledWith('inf'); - }); - - it('should use console.warn for Warn', function () { - Log.init_logging('warn'); - Log.Warn('wrn'); - expect(console.warn).to.have.been.called; - expect(console.warn).to.have.been.calledWith('wrn'); - }); - - it('should use console.error for Error', function () { - Log.init_logging('error'); - Log.Error('err'); - expect(console.error).to.have.been.called; - expect(console.error).to.have.been.calledWith('err'); - }); - }); - - // TODO(directxman12): test the conf_default and conf_defaults methods - // TODO(directxman12): test decodeUTF8 - // TODO(directxman12): test the event methods (addEvent, removeEvent, stopEvent) - // TODO(directxman12): figure out a good way to test getPosition and getEventPosition - // TODO(directxman12): figure out how to test the browser detection functions properly - // (we can't really test them against the browsers, except for Gecko - // via PhantomJS, the default test driver) -}); -/* eslint-enable no-console */ diff --git a/systemvm/agent/noVNC/tests/test.websock.js b/systemvm/agent/noVNC/tests/test.websock.js deleted file mode 100644 index 30e19e9de713..000000000000 --- a/systemvm/agent/noVNC/tests/test.websock.js +++ /dev/null @@ -1,441 +0,0 @@ -const expect = chai.expect; - -import Websock from '../core/websock.js'; -import FakeWebSocket from './fake.websocket.js'; - -describe('Websock', function () { - "use strict"; - - describe('Queue methods', function () { - let sock; - const RQ_TEMPLATE = new Uint8Array([0, 1, 2, 3, 4, 5, 6, 7]); - - beforeEach(function () { - sock = new Websock(); - // skip init - sock._allocate_buffers(); - sock._rQ.set(RQ_TEMPLATE); - sock._rQlen = RQ_TEMPLATE.length; - }); - describe('rQlen', function () { - it('should return the length of the receive queue', function () { - sock.rQi = 0; - - expect(sock.rQlen).to.equal(RQ_TEMPLATE.length); - }); - - it("should return the proper length if we read some from the receive queue", function () { - sock.rQi = 1; - - expect(sock.rQlen).to.equal(RQ_TEMPLATE.length - 1); - }); - }); - - describe('rQpeek8', function () { - it('should peek at the next byte without poping it off the queue', function () { - const bef_len = sock.rQlen; - const peek = sock.rQpeek8(); - expect(sock.rQpeek8()).to.equal(peek); - expect(sock.rQlen).to.equal(bef_len); - }); - }); - - describe('rQshift8()', function () { - it('should pop a single byte from the receive queue', function () { - const peek = sock.rQpeek8(); - const bef_len = sock.rQlen; - expect(sock.rQshift8()).to.equal(peek); - expect(sock.rQlen).to.equal(bef_len - 1); - }); - }); - - describe('rQshift16()', function () { - it('should pop two bytes from the receive queue and return a single number', function () { - const bef_len = sock.rQlen; - const expected = (RQ_TEMPLATE[0] << 8) + RQ_TEMPLATE[1]; - expect(sock.rQshift16()).to.equal(expected); - expect(sock.rQlen).to.equal(bef_len - 2); - }); - }); - - describe('rQshift32()', function () { - it('should pop four bytes from the receive queue and return a single number', function () { - const bef_len = sock.rQlen; - const expected = (RQ_TEMPLATE[0] << 24) + - (RQ_TEMPLATE[1] << 16) + - (RQ_TEMPLATE[2] << 8) + - RQ_TEMPLATE[3]; - expect(sock.rQshift32()).to.equal(expected); - expect(sock.rQlen).to.equal(bef_len - 4); - }); - }); - - describe('rQshiftStr', function () { - it('should shift the given number of bytes off of the receive queue and return a string', function () { - const bef_len = sock.rQlen; - const bef_rQi = sock.rQi; - const shifted = sock.rQshiftStr(3); - expect(shifted).to.be.a('string'); - expect(shifted).to.equal(String.fromCharCode.apply(null, Array.prototype.slice.call(new Uint8Array(RQ_TEMPLATE.buffer, bef_rQi, 3)))); - expect(sock.rQlen).to.equal(bef_len - 3); - }); - - it('should shift the entire rest of the queue off if no length is given', function () { - sock.rQshiftStr(); - expect(sock.rQlen).to.equal(0); - }); - - it('should be able to handle very large strings', function () { - const BIG_LEN = 500000; - const RQ_BIG = new Uint8Array(BIG_LEN); - let expected = ""; - let letterCode = 'a'.charCodeAt(0); - for (let i = 0; i < BIG_LEN; i++) { - RQ_BIG[i] = letterCode; - expected += String.fromCharCode(letterCode); - - if (letterCode < 'z'.charCodeAt(0)) { - letterCode++; - } else { - letterCode = 'a'.charCodeAt(0); - } - } - sock._rQ.set(RQ_BIG); - sock._rQlen = RQ_BIG.length; - - const shifted = sock.rQshiftStr(); - - expect(shifted).to.be.equal(expected); - expect(sock.rQlen).to.equal(0); - }); - }); - - describe('rQshiftBytes', function () { - it('should shift the given number of bytes of the receive queue and return an array', function () { - const bef_len = sock.rQlen; - const bef_rQi = sock.rQi; - const shifted = sock.rQshiftBytes(3); - expect(shifted).to.be.an.instanceof(Uint8Array); - expect(shifted).to.array.equal(new Uint8Array(RQ_TEMPLATE.buffer, bef_rQi, 3)); - expect(sock.rQlen).to.equal(bef_len - 3); - }); - - it('should shift the entire rest of the queue off if no length is given', function () { - sock.rQshiftBytes(); - expect(sock.rQlen).to.equal(0); - }); - }); - - describe('rQslice', function () { - beforeEach(function () { - sock.rQi = 0; - }); - - it('should not modify the receive queue', function () { - const bef_len = sock.rQlen; - sock.rQslice(0, 2); - expect(sock.rQlen).to.equal(bef_len); - }); - - it('should return an array containing the given slice of the receive queue', function () { - const sl = sock.rQslice(0, 2); - expect(sl).to.be.an.instanceof(Uint8Array); - expect(sl).to.array.equal(new Uint8Array(RQ_TEMPLATE.buffer, 0, 2)); - }); - - it('should use the rest of the receive queue if no end is given', function () { - const sl = sock.rQslice(1); - expect(sl).to.have.length(RQ_TEMPLATE.length - 1); - expect(sl).to.array.equal(new Uint8Array(RQ_TEMPLATE.buffer, 1)); - }); - - it('should take the current rQi in to account', function () { - sock.rQi = 1; - expect(sock.rQslice(0, 2)).to.array.equal(new Uint8Array(RQ_TEMPLATE.buffer, 1, 2)); - }); - }); - - describe('rQwait', function () { - beforeEach(function () { - sock.rQi = 0; - }); - - it('should return true if there are not enough bytes in the receive queue', function () { - expect(sock.rQwait('hi', RQ_TEMPLATE.length + 1)).to.be.true; - }); - - it('should return false if there are enough bytes in the receive queue', function () { - expect(sock.rQwait('hi', RQ_TEMPLATE.length)).to.be.false; - }); - - it('should return true and reduce rQi by "goback" if there are not enough bytes', function () { - sock.rQi = 5; - expect(sock.rQwait('hi', RQ_TEMPLATE.length, 4)).to.be.true; - expect(sock.rQi).to.equal(1); - }); - - it('should raise an error if we try to go back more than possible', function () { - sock.rQi = 5; - expect(() => sock.rQwait('hi', RQ_TEMPLATE.length, 6)).to.throw(Error); - }); - - it('should not reduce rQi if there are enough bytes', function () { - sock.rQi = 5; - sock.rQwait('hi', 1, 6); - expect(sock.rQi).to.equal(5); - }); - }); - - describe('flush', function () { - beforeEach(function () { - sock._websocket = { - send: sinon.spy() - }; - }); - - it('should actually send on the websocket', function () { - sock._websocket.bufferedAmount = 8; - sock._websocket.readyState = WebSocket.OPEN; - sock._sQ = new Uint8Array([1, 2, 3]); - sock._sQlen = 3; - const encoded = sock._encode_message(); - - sock.flush(); - expect(sock._websocket.send).to.have.been.calledOnce; - expect(sock._websocket.send).to.have.been.calledWith(encoded); - }); - - it('should not call send if we do not have anything queued up', function () { - sock._sQlen = 0; - sock._websocket.bufferedAmount = 8; - - sock.flush(); - - expect(sock._websocket.send).not.to.have.been.called; - }); - }); - - describe('send', function () { - beforeEach(function () { - sock.flush = sinon.spy(); - }); - - it('should add to the send queue', function () { - sock.send([1, 2, 3]); - const sq = sock.sQ; - expect(new Uint8Array(sq.buffer, sock._sQlen - 3, 3)).to.array.equal(new Uint8Array([1, 2, 3])); - }); - - it('should call flush', function () { - sock.send([1, 2, 3]); - expect(sock.flush).to.have.been.calledOnce; - }); - }); - - describe('send_string', function () { - beforeEach(function () { - sock.send = sinon.spy(); - }); - - it('should call send after converting the string to an array', function () { - sock.send_string("\x01\x02\x03"); - expect(sock.send).to.have.been.calledWith([1, 2, 3]); - }); - }); - }); - - describe('lifecycle methods', function () { - let old_WS; - before(function () { - old_WS = WebSocket; - }); - - let sock; - beforeEach(function () { - sock = new Websock(); - // eslint-disable-next-line no-global-assign - WebSocket = sinon.spy(); - WebSocket.OPEN = old_WS.OPEN; - WebSocket.CONNECTING = old_WS.CONNECTING; - WebSocket.CLOSING = old_WS.CLOSING; - WebSocket.CLOSED = old_WS.CLOSED; - - WebSocket.prototype.binaryType = 'arraybuffer'; - }); - - describe('opening', function () { - it('should pick the correct protocols if none are given', function () { - - }); - - it('should open the actual websocket', function () { - sock.open('ws://localhost:8675', 'binary'); - expect(WebSocket).to.have.been.calledWith('ws://localhost:8675', 'binary'); - }); - - // it('should initialize the event handlers')? - }); - - describe('closing', function () { - beforeEach(function () { - sock.open('ws://'); - sock._websocket.close = sinon.spy(); - }); - - it('should close the actual websocket if it is open', function () { - sock._websocket.readyState = WebSocket.OPEN; - sock.close(); - expect(sock._websocket.close).to.have.been.calledOnce; - }); - - it('should close the actual websocket if it is connecting', function () { - sock._websocket.readyState = WebSocket.CONNECTING; - sock.close(); - expect(sock._websocket.close).to.have.been.calledOnce; - }); - - it('should not try to close the actual websocket if closing', function () { - sock._websocket.readyState = WebSocket.CLOSING; - sock.close(); - expect(sock._websocket.close).not.to.have.been.called; - }); - - it('should not try to close the actual websocket if closed', function () { - sock._websocket.readyState = WebSocket.CLOSED; - sock.close(); - expect(sock._websocket.close).not.to.have.been.called; - }); - - it('should reset onmessage to not call _recv_message', function () { - sinon.spy(sock, '_recv_message'); - sock.close(); - sock._websocket.onmessage(null); - try { - expect(sock._recv_message).not.to.have.been.called; - } finally { - sock._recv_message.restore(); - } - }); - }); - - describe('event handlers', function () { - beforeEach(function () { - sock._recv_message = sinon.spy(); - sock.on('open', sinon.spy()); - sock.on('close', sinon.spy()); - sock.on('error', sinon.spy()); - sock.open('ws://'); - }); - - it('should call _recv_message on a message', function () { - sock._websocket.onmessage(null); - expect(sock._recv_message).to.have.been.calledOnce; - }); - - it('should call the open event handler on opening', function () { - sock._websocket.onopen(); - expect(sock._eventHandlers.open).to.have.been.calledOnce; - }); - - it('should call the close event handler on closing', function () { - sock._websocket.onclose(); - expect(sock._eventHandlers.close).to.have.been.calledOnce; - }); - - it('should call the error event handler on error', function () { - sock._websocket.onerror(); - expect(sock._eventHandlers.error).to.have.been.calledOnce; - }); - }); - - after(function () { - // eslint-disable-next-line no-global-assign - WebSocket = old_WS; - }); - }); - - describe('WebSocket Receiving', function () { - let sock; - beforeEach(function () { - sock = new Websock(); - sock._allocate_buffers(); - }); - - it('should support adding binary Uint8Array data to the receive queue', function () { - const msg = { data: new Uint8Array([1, 2, 3]) }; - sock._mode = 'binary'; - sock._recv_message(msg); - expect(sock.rQshiftStr(3)).to.equal('\x01\x02\x03'); - }); - - it('should call the message event handler if present', function () { - sock._eventHandlers.message = sinon.spy(); - const msg = { data: new Uint8Array([1, 2, 3]).buffer }; - sock._mode = 'binary'; - sock._recv_message(msg); - expect(sock._eventHandlers.message).to.have.been.calledOnce; - }); - - it('should not call the message event handler if there is nothing in the receive queue', function () { - sock._eventHandlers.message = sinon.spy(); - const msg = { data: new Uint8Array([]).buffer }; - sock._mode = 'binary'; - sock._recv_message(msg); - expect(sock._eventHandlers.message).not.to.have.been.called; - }); - - it('should compact the receive queue', function () { - // NB(sross): while this is an internal implementation detail, it's important to - // test, otherwise the receive queue could become very large very quickly - sock._rQ = new Uint8Array([0, 1, 2, 3, 4, 5, 0, 0, 0, 0]); - sock._rQlen = 6; - sock.rQi = 6; - sock._rQmax = 3; - const msg = { data: new Uint8Array([1, 2, 3]).buffer }; - sock._mode = 'binary'; - sock._recv_message(msg); - expect(sock._rQlen).to.equal(3); - expect(sock.rQi).to.equal(0); - }); - - it('should automatically resize the receive queue if the incoming message is too large', function () { - sock._rQ = new Uint8Array(20); - sock._rQlen = 0; - sock.rQi = 0; - sock._rQbufferSize = 20; - sock._rQmax = 2; - const msg = { data: new Uint8Array(30).buffer }; - sock._mode = 'binary'; - sock._recv_message(msg); - expect(sock._rQlen).to.equal(30); - expect(sock.rQi).to.equal(0); - expect(sock._rQ.length).to.equal(240); // keep the invariant that rQbufferSize / 8 >= rQlen - }); - }); - - describe('Data encoding', function () { - before(function () { FakeWebSocket.replace(); }); - after(function () { FakeWebSocket.restore(); }); - - describe('as binary data', function () { - let sock; - beforeEach(function () { - sock = new Websock(); - sock.open('ws://', 'binary'); - sock._websocket._open(); - }); - - it('should only send the send queue up to the send queue length', function () { - sock._sQ = new Uint8Array([1, 2, 3, 4, 5]); - sock._sQlen = 3; - const res = sock._encode_message(); - expect(res).to.array.equal(new Uint8Array([1, 2, 3])); - }); - - it('should properly pass the encoded data off to the actual WebSocket', function () { - sock.send([1, 2, 3]); - expect(sock._websocket._get_sent_data()).to.array.equal(new Uint8Array([1, 2, 3])); - }); - }); - }); -}); diff --git a/systemvm/agent/noVNC/tests/test.webutil.js b/systemvm/agent/noVNC/tests/test.webutil.js deleted file mode 100644 index 72e194210d57..000000000000 --- a/systemvm/agent/noVNC/tests/test.webutil.js +++ /dev/null @@ -1,184 +0,0 @@ -/* jshint expr: true */ - -const expect = chai.expect; - -import * as WebUtil from '../app/webutil.js'; - -describe('WebUtil', function () { - "use strict"; - - describe('settings', function () { - - describe('localStorage', function () { - let chrome = window.chrome; - before(function () { - chrome = window.chrome; - window.chrome = null; - }); - after(function () { - window.chrome = chrome; - }); - - let origLocalStorage; - beforeEach(function () { - origLocalStorage = Object.getOwnPropertyDescriptor(window, "localStorage"); - if (origLocalStorage === undefined) { - // Object.getOwnPropertyDescriptor() doesn't work - // properly in any version of IE - this.skip(); - } - - Object.defineProperty(window, "localStorage", {value: {}}); - if (window.localStorage.setItem !== undefined) { - // Object.defineProperty() doesn't work properly in old - // versions of Chrome - this.skip(); - } - - window.localStorage.setItem = sinon.stub(); - window.localStorage.getItem = sinon.stub(); - window.localStorage.removeItem = sinon.stub(); - - return WebUtil.initSettings(); - }); - afterEach(function () { - Object.defineProperty(window, "localStorage", origLocalStorage); - }); - - describe('writeSetting', function () { - it('should save the setting value to local storage', function () { - WebUtil.writeSetting('test', 'value'); - expect(window.localStorage.setItem).to.have.been.calledWithExactly('test', 'value'); - expect(WebUtil.readSetting('test')).to.equal('value'); - }); - }); - - describe('setSetting', function () { - it('should update the setting but not save to local storage', function () { - WebUtil.setSetting('test', 'value'); - expect(window.localStorage.setItem).to.not.have.been.called; - expect(WebUtil.readSetting('test')).to.equal('value'); - }); - }); - - describe('readSetting', function () { - it('should read the setting value from local storage', function () { - localStorage.getItem.returns('value'); - expect(WebUtil.readSetting('test')).to.equal('value'); - }); - - it('should return the default value when not in local storage', function () { - expect(WebUtil.readSetting('test', 'default')).to.equal('default'); - }); - - it('should return the cached value even if local storage changed', function () { - localStorage.getItem.returns('value'); - expect(WebUtil.readSetting('test')).to.equal('value'); - localStorage.getItem.returns('something else'); - expect(WebUtil.readSetting('test')).to.equal('value'); - }); - - it('should cache the value even if it is not initially in local storage', function () { - expect(WebUtil.readSetting('test')).to.be.null; - localStorage.getItem.returns('value'); - expect(WebUtil.readSetting('test')).to.be.null; - }); - - it('should return the default value always if the first read was not in local storage', function () { - expect(WebUtil.readSetting('test', 'default')).to.equal('default'); - localStorage.getItem.returns('value'); - expect(WebUtil.readSetting('test', 'another default')).to.equal('another default'); - }); - - it('should return the last local written value', function () { - localStorage.getItem.returns('value'); - expect(WebUtil.readSetting('test')).to.equal('value'); - WebUtil.writeSetting('test', 'something else'); - expect(WebUtil.readSetting('test')).to.equal('something else'); - }); - }); - - // this doesn't appear to be used anywhere - describe('eraseSetting', function () { - it('should remove the setting from local storage', function () { - WebUtil.eraseSetting('test'); - expect(window.localStorage.removeItem).to.have.been.calledWithExactly('test'); - }); - }); - }); - - describe('chrome.storage', function () { - let chrome = window.chrome; - let settings = {}; - before(function () { - chrome = window.chrome; - window.chrome = { - storage: { - sync: { - get(cb) { cb(settings); }, - set() {}, - remove() {} - } - } - }; - }); - after(function () { - window.chrome = chrome; - }); - - const csSandbox = sinon.createSandbox(); - - beforeEach(function () { - settings = {}; - csSandbox.spy(window.chrome.storage.sync, 'set'); - csSandbox.spy(window.chrome.storage.sync, 'remove'); - return WebUtil.initSettings(); - }); - afterEach(function () { - csSandbox.restore(); - }); - - describe('writeSetting', function () { - it('should save the setting value to chrome storage', function () { - WebUtil.writeSetting('test', 'value'); - expect(window.chrome.storage.sync.set).to.have.been.calledWithExactly(sinon.match({ test: 'value' })); - expect(WebUtil.readSetting('test')).to.equal('value'); - }); - }); - - describe('setSetting', function () { - it('should update the setting but not save to chrome storage', function () { - WebUtil.setSetting('test', 'value'); - expect(window.chrome.storage.sync.set).to.not.have.been.called; - expect(WebUtil.readSetting('test')).to.equal('value'); - }); - }); - - describe('readSetting', function () { - it('should read the setting value from chrome storage', function () { - settings.test = 'value'; - expect(WebUtil.readSetting('test')).to.equal('value'); - }); - - it('should return the default value when not in chrome storage', function () { - expect(WebUtil.readSetting('test', 'default')).to.equal('default'); - }); - - it('should return the last local written value', function () { - settings.test = 'value'; - expect(WebUtil.readSetting('test')).to.equal('value'); - WebUtil.writeSetting('test', 'something else'); - expect(WebUtil.readSetting('test')).to.equal('something else'); - }); - }); - - // this doesn't appear to be used anywhere - describe('eraseSetting', function () { - it('should remove the setting from chrome storage', function () { - WebUtil.eraseSetting('test'); - expect(window.chrome.storage.sync.remove).to.have.been.calledWithExactly('test'); - }); - }); - }); - }); -}); diff --git a/systemvm/agent/noVNC/tests/vnc_playback.html b/systemvm/agent/noVNC/tests/vnc_playback.html deleted file mode 100644 index 4fd746580530..000000000000 --- a/systemvm/agent/noVNC/tests/vnc_playback.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - VNC Playback - - - - - - - - - - - Iterations:   - Perftest:  - Realtime:   - -   - -

    - - Results:
    - - -

    - -

    -
    Loading
    -
    - - - - diff --git a/systemvm/agent/noVNC/utils/.eslintrc b/systemvm/agent/noVNC/utils/.eslintrc deleted file mode 100644 index b7dc129f139e..000000000000 --- a/systemvm/agent/noVNC/utils/.eslintrc +++ /dev/null @@ -1,8 +0,0 @@ -{ - "env": { - "node": true - }, - "rules": { - "no-console": 0 - } -} \ No newline at end of file diff --git a/systemvm/agent/noVNC/utils/README.md b/systemvm/agent/noVNC/utils/README.md deleted file mode 100644 index 32582e65ea8c..000000000000 --- a/systemvm/agent/noVNC/utils/README.md +++ /dev/null @@ -1,14 +0,0 @@ -## WebSockets Proxy/Bridge - -Websockify has been forked out into its own project. `launch.sh` wil -automatically download it here if it is not already present and not -installed as system-wide. - -For more detailed description and usage information please refer to -the [websockify README](https://github.com/novnc/websockify/blob/master/README.md). - -The other versions of websockify (C, Node.js) and the associated test -programs have been moved to -[websockify](https://github.com/novnc/websockify). Websockify was -formerly named wsproxy. - diff --git a/systemvm/agent/noVNC/utils/b64-to-binary.pl b/systemvm/agent/noVNC/utils/b64-to-binary.pl deleted file mode 100755 index 280e28c93f03..000000000000 --- a/systemvm/agent/noVNC/utils/b64-to-binary.pl +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env perl -use MIME::Base64; - -for (<>) { - unless (/^'([{}])(\d+)\1(.+?)',$/) { - print; - next; - } - - my ($dir, $amt, $b64) = ($1, $2, $3); - - my $decoded = MIME::Base64::decode($b64) or die "Could not base64-decode line `$_`"; - - my $decoded_escaped = join "", map { "\\x$_" } unpack("(H2)*", $decoded); - - print "'${dir}${amt}${dir}${decoded_escaped}',\n"; -} diff --git a/systemvm/agent/noVNC/utils/genkeysymdef.js b/systemvm/agent/noVNC/utils/genkeysymdef.js deleted file mode 100755 index d21773f9f65f..000000000000 --- a/systemvm/agent/noVNC/utils/genkeysymdef.js +++ /dev/null @@ -1,127 +0,0 @@ -#!/usr/bin/env node -/* - * genkeysymdef: X11 keysymdef.h to JavaScript converter - * Copyright (C) 2018 The noVNC Authors - * Licensed under MPL 2.0 (see LICENSE.txt) - */ - -"use strict"; - -const fs = require('fs'); - -let show_help = process.argv.length === 2; -let filename; - -for (let i = 2; i < process.argv.length; ++i) { - switch (process.argv[i]) { - case "--help": - case "-h": - show_help = true; - break; - case "--file": - case "-f": - default: - filename = process.argv[i]; - } -} - -if (!filename) { - show_help = true; - console.log("Error: No filename specified\n"); -} - -if (show_help) { - console.log("Parses a *nix keysymdef.h to generate Unicode code point mappings"); - console.log("Usage: node parse.js [options] filename:"); - console.log(" -h [ --help ] Produce this help message"); - console.log(" filename The keysymdef.h file to parse"); - process.exit(0); -} - -const buf = fs.readFileSync(filename); -const str = buf.toString('utf8'); - -const re = /^#define XK_([a-zA-Z_0-9]+)\s+0x([0-9a-fA-F]+)\s*(\/\*\s*(.*)\s*\*\/)?\s*$/m; - -const arr = str.split('\n'); - -const codepoints = {}; - -for (let i = 0; i < arr.length; ++i) { - const result = re.exec(arr[i]); - if (result) { - const keyname = result[1]; - const keysym = parseInt(result[2], 16); - const remainder = result[3]; - - const unicodeRes = /U\+([0-9a-fA-F]+)/.exec(remainder); - if (unicodeRes) { - const unicode = parseInt(unicodeRes[1], 16); - // The first entry is the preferred one - if (!codepoints[unicode]) { - codepoints[unicode] = { keysym: keysym, name: keyname }; - } - } - } -} - -let out = -"/*\n" + -" * Mapping from Unicode codepoints to X11/RFB keysyms\n" + -" *\n" + -" * This file was automatically generated from keysymdef.h\n" + -" * DO NOT EDIT!\n" + -" */\n" + -"\n" + -"/* Functions at the bottom */\n" + -"\n" + -"const codepoints = {\n"; - -function toHex(num) { - let s = num.toString(16); - if (s.length < 4) { - s = ("0000" + s).slice(-4); - } - return "0x" + s; -} - -for (let codepoint in codepoints) { - codepoint = parseInt(codepoint); - - // Latin-1? - if ((codepoint >= 0x20) && (codepoint <= 0xff)) { - continue; - } - - // Handled by the general Unicode mapping? - if ((codepoint | 0x01000000) === codepoints[codepoint].keysym) { - continue; - } - - out += " " + toHex(codepoint) + ": " + - toHex(codepoints[codepoint].keysym) + - ", // XK_" + codepoints[codepoint].name + "\n"; -} - -out += -"};\n" + -"\n" + -"export default {\n" + -" lookup(u) {\n" + -" // Latin-1 is one-to-one mapping\n" + -" if ((u >= 0x20) && (u <= 0xff)) {\n" + -" return u;\n" + -" }\n" + -"\n" + -" // Lookup table (fairly random)\n" + -" const keysym = codepoints[u];\n" + -" if (keysym !== undefined) {\n" + -" return keysym;\n" + -" }\n" + -"\n" + -" // General mapping as final fallback\n" + -" return 0x01000000 | u;\n" + -" },\n" + -"};"; - -console.log(out); diff --git a/systemvm/agent/noVNC/utils/img2js.py b/systemvm/agent/noVNC/utils/img2js.py deleted file mode 100755 index ceab6bf75431..000000000000 --- a/systemvm/agent/noVNC/utils/img2js.py +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/env python - -# -# Convert image to Javascript compatible base64 Data URI -# Copyright (C) 2018 The noVNC Authors -# Licensed under MPL 2.0 (see docs/LICENSE.MPL-2.0) -# - -import sys, base64 - -try: - from PIL import Image -except: - print "python PIL module required (python-imaging package)" - sys.exit(1) - - -if len(sys.argv) < 3: - print "Usage: %s IMAGE JS_VARIABLE" % sys.argv[0] - sys.exit(1) - -fname = sys.argv[1] -var = sys.argv[2] - -ext = fname.lower().split('.')[-1] -if ext == "png": mime = "image/png" -elif ext in ["jpg", "jpeg"]: mime = "image/jpeg" -elif ext == "gif": mime = "image/gif" -else: - print "Only PNG, JPEG and GIF images are supported" - sys.exit(1) -uri = "data:%s;base64," % mime - -im = Image.open(fname) -w, h = im.size - -raw = open(fname).read() - -print '%s = {"width": %s, "height": %s, "data": "%s%s"};' % ( - var, w, h, uri, base64.b64encode(raw)) diff --git a/systemvm/agent/noVNC/utils/json2graph.py b/systemvm/agent/noVNC/utils/json2graph.py deleted file mode 100755 index bdaeeccaf212..000000000000 --- a/systemvm/agent/noVNC/utils/json2graph.py +++ /dev/null @@ -1,206 +0,0 @@ -#!/usr/bin/env python - -''' -Use matplotlib to generate performance charts -Copyright (C) 2018 The noVNC Authors -Licensed under MPL-2.0 (see docs/LICENSE.MPL-2.0) -''' - -# a bar plot with errorbars -import sys, json -import numpy as np -import matplotlib.pyplot as plt -from matplotlib.font_manager import FontProperties - -def usage(): - print "%s json_file level1 level2 level3 [legend_height]\n\n" % sys.argv[0] - print "Description:\n" - print "level1, level2, and level3 are one each of the following:\n"; - print " select=ITEM - select only ITEM at this level"; - print " bar - each item on this level becomes a graph bar"; - print " group - items on this level become groups of bars"; - print "\n"; - print "json_file is a file containing json data in the following format:\n" - print ' {'; - print ' "conf": {'; - print ' "order_l1": ['; - print ' "level1_label1",'; - print ' "level1_label2",'; - print ' ...'; - print ' ],'; - print ' "order_l2": ['; - print ' "level2_label1",'; - print ' "level2_label2",'; - print ' ...'; - print ' ],'; - print ' "order_l3": ['; - print ' "level3_label1",'; - print ' "level3_label2",'; - print ' ...'; - print ' ]'; - print ' },'; - print ' "stats": {'; - print ' "level1_label1": {'; - print ' "level2_label1": {'; - print ' "level3_label1": [val1, val2, val3],'; - print ' "level3_label2": [val1, val2, val3],'; - print ' ...'; - print ' },'; - print ' "level2_label2": {'; - print ' ...'; - print ' },'; - print ' },'; - print ' "level1_label2": {'; - print ' ...'; - print ' },'; - print ' ...'; - print ' },'; - print ' }'; - sys.exit(2) - -def error(msg): - print msg - sys.exit(1) - - -#colors = ['#ff0000', '#0863e9', '#00f200', '#ffa100', -# '#800000', '#805100', '#013075', '#007900'] -colors = ['#ff0000', '#00ff00', '#0000ff', - '#dddd00', '#dd00dd', '#00dddd', - '#dd6622', '#dd2266', '#66dd22', - '#8844dd', '#44dd88', '#4488dd'] - -if len(sys.argv) < 5: - usage() - -filename = sys.argv[1] -L1 = sys.argv[2] -L2 = sys.argv[3] -L3 = sys.argv[4] -if len(sys.argv) > 5: - legendHeight = float(sys.argv[5]) -else: - legendHeight = 0.75 - -# Load the JSON data from the file -data = json.loads(file(filename).read()) -conf = data['conf'] -stats = data['stats'] - -# Sanity check data hierarchy -if len(conf['order_l1']) != len(stats.keys()): - error("conf.order_l1 does not match stats level 1") -for l1 in stats.keys(): - if len(conf['order_l2']) != len(stats[l1].keys()): - error("conf.order_l2 does not match stats level 2 for %s" % l1) - if conf['order_l1'].count(l1) < 1: - error("%s not found in conf.order_l1" % l1) - for l2 in stats[l1].keys(): - if len(conf['order_l3']) != len(stats[l1][l2].keys()): - error("conf.order_l3 does not match stats level 3") - if conf['order_l2'].count(l2) < 1: - error("%s not found in conf.order_l2" % l2) - for l3 in stats[l1][l2].keys(): - if conf['order_l3'].count(l3) < 1: - error("%s not found in conf.order_l3" % l3) - -# -# Generate the data based on the level specifications -# -bar_labels = None -group_labels = None -bar_vals = [] -bar_sdvs = [] -if L3.startswith("select="): - select_label = l3 = L3.split("=")[1] - bar_labels = conf['order_l1'] - group_labels = conf['order_l2'] - bar_vals = [[0]*len(group_labels) for i in bar_labels] - bar_sdvs = [[0]*len(group_labels) for i in bar_labels] - for b in range(len(bar_labels)): - l1 = bar_labels[b] - for g in range(len(group_labels)): - l2 = group_labels[g] - bar_vals[b][g] = np.mean(stats[l1][l2][l3]) - bar_sdvs[b][g] = np.std(stats[l1][l2][l3]) -elif L2.startswith("select="): - select_label = l2 = L2.split("=")[1] - bar_labels = conf['order_l1'] - group_labels = conf['order_l3'] - bar_vals = [[0]*len(group_labels) for i in bar_labels] - bar_sdvs = [[0]*len(group_labels) for i in bar_labels] - for b in range(len(bar_labels)): - l1 = bar_labels[b] - for g in range(len(group_labels)): - l3 = group_labels[g] - bar_vals[b][g] = np.mean(stats[l1][l2][l3]) - bar_sdvs[b][g] = np.std(stats[l1][l2][l3]) -elif L1.startswith("select="): - select_label = l1 = L1.split("=")[1] - bar_labels = conf['order_l2'] - group_labels = conf['order_l3'] - bar_vals = [[0]*len(group_labels) for i in bar_labels] - bar_sdvs = [[0]*len(group_labels) for i in bar_labels] - for b in range(len(bar_labels)): - l2 = bar_labels[b] - for g in range(len(group_labels)): - l3 = group_labels[g] - bar_vals[b][g] = np.mean(stats[l1][l2][l3]) - bar_sdvs[b][g] = np.std(stats[l1][l2][l3]) -else: - usage() - -# If group is before bar then flip (zip) the data -if [L1, L2, L3].index("group") < [L1, L2, L3].index("bar"): - bar_labels, group_labels = group_labels, bar_labels - bar_vals = zip(*bar_vals) - bar_sdvs = zip(*bar_sdvs) - -print "bar_vals:", bar_vals - -# -# Now render the bar graph -# -ind = np.arange(len(group_labels)) # the x locations for the groups -width = 0.8 * (1.0/len(bar_labels)) # the width of the bars - -fig = plt.figure(figsize=(10,6), dpi=80) -plot = fig.add_subplot(1, 1, 1) - -rects = [] -for i in range(len(bar_vals)): - rects.append(plot.bar(ind+width*i, bar_vals[i], width, color=colors[i], - yerr=bar_sdvs[i], align='center')) - -# add some -plot.set_ylabel('Milliseconds (less is better)') -plot.set_title("Javascript array test: %s" % select_label) -plot.set_xticks(ind+width) -plot.set_xticklabels( group_labels ) - -fontP = FontProperties() -fontP.set_size('small') -plot.legend( [r[0] for r in rects], bar_labels, prop=fontP, - loc = 'center right', bbox_to_anchor = (1.0, legendHeight)) - -def autolabel(rects): - # attach some text labels - for rect in rects: - height = rect.get_height() - if np.isnan(height): - height = 0.0 - plot.text(rect.get_x()+rect.get_width()/2., height+20, '%d'%int(height), - ha='center', va='bottom', size='7') - -for rect in rects: - autolabel(rect) - -# Adjust axis sizes -axis = list(plot.axis()) -axis[0] = -width # Make sure left side has enough for bar -#axis[1] = axis[1] * 1.20 # Add 20% to the right to make sure it fits -axis[2] = 0 # Make y-axis start at 0 -axis[3] = axis[3] * 1.10 # Add 10% to the top -plot.axis(axis) - -plt.show() diff --git a/systemvm/agent/noVNC/utils/launch.sh b/systemvm/agent/noVNC/utils/launch.sh deleted file mode 100755 index 162607eb05c6..000000000000 --- a/systemvm/agent/noVNC/utils/launch.sh +++ /dev/null @@ -1,169 +0,0 @@ -#!/usr/bin/env bash - -# Copyright (C) 2018 The noVNC Authors -# Licensed under MPL 2.0 or any later version (see LICENSE.txt) - -usage() { - if [ "$*" ]; then - echo "$*" - echo - fi - echo "Usage: ${NAME} [--listen PORT] [--vnc VNC_HOST:PORT] [--cert CERT] [--ssl-only]" - echo - echo "Starts the WebSockets proxy and a mini-webserver and " - echo "provides a cut-and-paste URL to go to." - echo - echo " --listen PORT Port for proxy/webserver to listen on" - echo " Default: 6080" - echo " --vnc VNC_HOST:PORT VNC server host:port proxy target" - echo " Default: localhost:5900" - echo " --cert CERT Path to combined cert/key file" - echo " Default: self.pem" - echo " --web WEB Path to web files (e.g. vnc.html)" - echo " Default: ./" - echo " --ssl-only Disable non-https connections." - echo " " - echo " --record FILE Record traffic to FILE.session.js" - echo " " - exit 2 -} - -NAME="$(basename $0)" -REAL_NAME="$(readlink -f $0)" -HERE="$(cd "$(dirname "$REAL_NAME")" && pwd)" -PORT="6080" -VNC_DEST="localhost:5900" -CERT="" -WEB="" -proxy_pid="" -SSLONLY="" -RECORD_ARG="" - -die() { - echo "$*" - exit 1 -} - -cleanup() { - trap - TERM QUIT INT EXIT - trap "true" CHLD # Ignore cleanup messages - echo - if [ -n "${proxy_pid}" ]; then - echo "Terminating WebSockets proxy (${proxy_pid})" - kill ${proxy_pid} - fi -} - -# Process Arguments - -# Arguments that only apply to chrooter itself -while [ "$*" ]; do - param=$1; shift; OPTARG=$1 - case $param in - --listen) PORT="${OPTARG}"; shift ;; - --vnc) VNC_DEST="${OPTARG}"; shift ;; - --cert) CERT="${OPTARG}"; shift ;; - --web) WEB="${OPTARG}"; shift ;; - --ssl-only) SSLONLY="--ssl-only" ;; - --record) RECORD_ARG="--record ${OPTARG}"; shift ;; - -h|--help) usage ;; - -*) usage "Unknown chrooter option: ${param}" ;; - *) break ;; - esac -done - -# Sanity checks -if bash -c "exec 7<>/dev/tcp/localhost/${PORT}" &> /dev/null; then - exec 7<&- - exec 7>&- - die "Port ${PORT} in use. Try --listen PORT" -else - exec 7<&- - exec 7>&- -fi - -trap "cleanup" TERM QUIT INT EXIT - -# Find vnc.html -if [ -n "${WEB}" ]; then - if [ ! -e "${WEB}/vnc.html" ]; then - die "Could not find ${WEB}/vnc.html" - fi -elif [ -e "$(pwd)/vnc.html" ]; then - WEB=$(pwd) -elif [ -e "${HERE}/../vnc.html" ]; then - WEB=${HERE}/../ -elif [ -e "${HERE}/vnc.html" ]; then - WEB=${HERE} -elif [ -e "${HERE}/../share/novnc/vnc.html" ]; then - WEB=${HERE}/../share/novnc/ -else - die "Could not find vnc.html" -fi - -# Find self.pem -if [ -n "${CERT}" ]; then - if [ ! -e "${CERT}" ]; then - die "Could not find ${CERT}" - fi -elif [ -e "$(pwd)/self.pem" ]; then - CERT="$(pwd)/self.pem" -elif [ -e "${HERE}/../self.pem" ]; then - CERT="${HERE}/../self.pem" -elif [ -e "${HERE}/self.pem" ]; then - CERT="${HERE}/self.pem" -else - echo "Warning: could not find self.pem" -fi - -# try to find websockify (prefer local, try global, then download local) -if [[ -e ${HERE}/websockify ]]; then - WEBSOCKIFY=${HERE}/websockify/run - - if [[ ! -x $WEBSOCKIFY ]]; then - echo "The path ${HERE}/websockify exists, but $WEBSOCKIFY either does not exist or is not executable." - echo "If you intended to use an installed websockify package, please remove ${HERE}/websockify." - exit 1 - fi - - echo "Using local websockify at $WEBSOCKIFY" -else - WEBSOCKIFY=$(which websockify 2>/dev/null) - - if [[ $? -ne 0 ]]; then - echo "No installed websockify, attempting to clone websockify..." - WEBSOCKIFY=${HERE}/websockify/run - git clone https://github.com/novnc/websockify ${HERE}/websockify - - if [[ ! -e $WEBSOCKIFY ]]; then - echo "Unable to locate ${HERE}/websockify/run after downloading" - exit 1 - fi - - echo "Using local websockify at $WEBSOCKIFY" - else - echo "Using installed websockify at $WEBSOCKIFY" - fi -fi - -echo "Starting webserver and WebSockets proxy on port ${PORT}" -#${HERE}/websockify --web ${WEB} ${CERT:+--cert ${CERT}} ${PORT} ${VNC_DEST} & -${WEBSOCKIFY} ${SSLONLY} --web ${WEB} ${CERT:+--cert ${CERT}} ${PORT} ${VNC_DEST} ${RECORD_ARG} & -proxy_pid="$!" -sleep 1 -if ! ps -p ${proxy_pid} >/dev/null; then - proxy_pid= - echo "Failed to start WebSockets proxy" - exit 1 -fi - -echo -e "\n\nNavigate to this URL:\n" -if [ "x$SSLONLY" == "x" ]; then - echo -e " http://$(hostname):${PORT}/vnc.html?host=$(hostname)&port=${PORT}\n" -else - echo -e " https://$(hostname):${PORT}/vnc.html?host=$(hostname)&port=${PORT}\n" -fi - -echo -e "Press Ctrl-C to exit\n\n" - -wait ${proxy_pid} diff --git a/systemvm/agent/noVNC/utils/u2x11 b/systemvm/agent/noVNC/utils/u2x11 deleted file mode 100755 index fd3e4ba88a5f..000000000000 --- a/systemvm/agent/noVNC/utils/u2x11 +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash -# -# Convert "U+..." commented entries in /usr/include/X11/keysymdef.h -# into JavaScript for use by noVNC. Note this is likely to produce -# a few duplicate properties with clashing values, that will need -# resolving manually. -# -# Colin Dean -# - -regex="^#define[ \t]+XK_[A-Za-z0-9_]+[ \t]+0x([0-9a-fA-F]+)[ \t]+\/\*[ \t]+U\+([0-9a-fA-F]+)[ \t]+[^*]+.[ \t]+\*\/[ \t]*$" -echo "unicodeTable = {" -while read line; do - if echo "${line}" | egrep -qs "${regex}"; then - - x11=$(echo "${line}" | sed -r "s/${regex}/\1/") - vnc=$(echo "${line}" | sed -r "s/${regex}/\2/") - - if echo "${vnc}" | egrep -qs "^00[2-9A-F][0-9A-F]$"; then - : # skip ISO Latin-1 (U+0020 to U+00FF) as 1-to-1 mapping - else - # note 1-to-1 is possible (e.g. for Euro symbol, U+20AC) - echo " 0x${vnc} : 0x${x11}," - fi - fi -done < /usr/include/X11/keysymdef.h | uniq -echo "};" - diff --git a/systemvm/agent/noVNC/utils/use_require.js b/systemvm/agent/noVNC/utils/use_require.js deleted file mode 100755 index 248792718c92..000000000000 --- a/systemvm/agent/noVNC/utils/use_require.js +++ /dev/null @@ -1,313 +0,0 @@ -#!/usr/bin/env node - -const path = require('path'); -const program = require('commander'); -const fs = require('fs'); -const fse = require('fs-extra'); -const babel = require('babel-core'); - -const SUPPORTED_FORMATS = new Set(['amd', 'commonjs', 'systemjs', 'umd']); - -program - .option('--as [format]', `output files using various import formats instead of ES6 import and export. Supports ${Array.from(SUPPORTED_FORMATS)}.`) - .option('-m, --with-source-maps [type]', 'output source maps when not generating a bundled app (type may be empty for external source maps, inline for inline source maps, or both) ') - .option('--with-app', 'process app files as well as core files') - .option('--only-legacy', 'only output legacy files (no ES6 modules) for the app') - .option('--clean', 'clear the lib folder before building') - .parse(process.argv); - -// the various important paths -const paths = { - main: path.resolve(__dirname, '..'), - core: path.resolve(__dirname, '..', 'core'), - app: path.resolve(__dirname, '..', 'app'), - vendor: path.resolve(__dirname, '..', 'vendor'), - out_dir_base: path.resolve(__dirname, '..', 'build'), - lib_dir_base: path.resolve(__dirname, '..', 'lib'), -}; - -const no_copy_files = new Set([ - // skip these -- they don't belong in the processed application - path.join(paths.vendor, 'sinon.js'), - path.join(paths.vendor, 'browser-es-module-loader'), - path.join(paths.vendor, 'promise.js'), - path.join(paths.app, 'images', 'icons', 'Makefile'), -]); - -const no_transform_files = new Set([ - // don't transform this -- we want it imported as-is to properly catch loading errors - path.join(paths.app, 'error-handler.js'), -]); - -no_copy_files.forEach(file => no_transform_files.add(file)); - -// util.promisify requires Node.js 8.x, so we have our own -function promisify(original) { - return function promise_wrap() { - const args = Array.prototype.slice.call(arguments); - return new Promise((resolve, reject) => { - original.apply(this, args.concat((err, value) => { - if (err) return reject(err); - resolve(value); - })); - }); - }; -} - -const readFile = promisify(fs.readFile); -const writeFile = promisify(fs.writeFile); - -const readdir = promisify(fs.readdir); -const lstat = promisify(fs.lstat); - -const copy = promisify(fse.copy); -const unlink = promisify(fse.unlink); -const ensureDir = promisify(fse.ensureDir); -const rmdir = promisify(fse.rmdir); - -const babelTransformFile = promisify(babel.transformFile); - -// walkDir *recursively* walks directories trees, -// calling the callback for all normal files found. -function walkDir(base_path, cb, filter) { - return readdir(base_path) - .then((files) => { - const paths = files.map(filename => path.join(base_path, filename)); - return Promise.all(paths.map(filepath => lstat(filepath) - .then((stats) => { - if (filter !== undefined && !filter(filepath, stats)) return; - - if (stats.isSymbolicLink()) return; - if (stats.isFile()) return cb(filepath); - if (stats.isDirectory()) return walkDir(filepath, cb, filter); - }))); - }); -} - -function transform_html(legacy_scripts, only_legacy) { - // write out the modified vnc.html file that works with the bundle - const src_html_path = path.resolve(__dirname, '..', 'vnc.html'); - const out_html_path = path.resolve(paths.out_dir_base, 'vnc.html'); - return readFile(src_html_path) - .then((contents_raw) => { - let contents = contents_raw.toString(); - - const start_marker = '\n'; - const end_marker = ''; - const start_ind = contents.indexOf(start_marker) + start_marker.length; - const end_ind = contents.indexOf(end_marker, start_ind); - - let new_script = ''; - - if (only_legacy) { - // Only legacy version, so include things directly - for (let i = 0;i < legacy_scripts.length;i++) { - new_script += ` \n`; - } - } else { - // Otherwise detect if it's a modern browser and select - // variant accordingly - new_script += `\ - \n\ - \n`; - - // Original, ES6 modules - new_script += ' \n'; - } - - contents = contents.slice(0, start_ind) + `${new_script}\n` + contents.slice(end_ind); - - return contents; - }) - .then((contents) => { - console.log(`Writing ${out_html_path}`); - return writeFile(out_html_path, contents); - }); -} - -function make_lib_files(import_format, source_maps, with_app_dir, only_legacy) { - if (!import_format) { - throw new Error("you must specify an import format to generate compiled noVNC libraries"); - } else if (!SUPPORTED_FORMATS.has(import_format)) { - throw new Error(`unsupported output format "${import_format}" for import/export -- only ${Array.from(SUPPORTED_FORMATS)} are supported`); - } - - // NB: we need to make a copy of babel_opts, since babel sets some defaults on it - const babel_opts = () => ({ - plugins: [`transform-es2015-modules-${import_format}`], - presets: ['es2015'], - ast: false, - sourceMaps: source_maps, - }); - - // No point in duplicate files without the app, so force only converted files - if (!with_app_dir) { - only_legacy = true; - } - - let in_path; - let out_path_base; - if (with_app_dir) { - out_path_base = paths.out_dir_base; - in_path = paths.main; - } else { - out_path_base = paths.lib_dir_base; - } - const legacy_path_base = only_legacy ? out_path_base : path.join(out_path_base, 'legacy'); - - fse.ensureDirSync(out_path_base); - - const helpers = require('./use_require_helpers'); - const helper = helpers[import_format]; - - const outFiles = []; - - const handleDir = (js_only, vendor_rewrite, in_path_base, filename) => Promise.resolve() - .then(() => { - if (no_copy_files.has(filename)) return; - - const out_path = path.join(out_path_base, path.relative(in_path_base, filename)); - const legacy_path = path.join(legacy_path_base, path.relative(in_path_base, filename)); - - if (path.extname(filename) !== '.js') { - if (!js_only) { - console.log(`Writing ${out_path}`); - return copy(filename, out_path); - } - return; // skip non-javascript files - } - - return Promise.resolve() - .then(() => { - if (only_legacy && !no_transform_files.has(filename)) { - return; - } - return ensureDir(path.dirname(out_path)) - .then(() => { - console.log(`Writing ${out_path}`); - return copy(filename, out_path); - }); - }) - .then(() => ensureDir(path.dirname(legacy_path))) - .then(() => { - if (no_transform_files.has(filename)) { - return; - } - - const opts = babel_opts(); - if (helper && helpers.optionsOverride) { - helper.optionsOverride(opts); - } - // Adjust for the fact that we move the core files relative - // to the vendor directory - if (vendor_rewrite) { - opts.plugins.push(["import-redirect", - {"root": legacy_path_base, - "redirect": { "vendor/(.+)": "./vendor/$1"}}]); - } - - return babelTransformFile(filename, opts) - .then((res) => { - console.log(`Writing ${legacy_path}`); - const {map} = res; - let {code} = res; - if (source_maps === true) { - // append URL for external source map - code += `\n//# sourceMappingURL=${path.basename(legacy_path)}.map\n`; - } - outFiles.push(`${legacy_path}`); - return writeFile(legacy_path, code) - .then(() => { - if (source_maps === true || source_maps === 'both') { - console.log(` and ${legacy_path}.map`); - outFiles.push(`${legacy_path}.map`); - return writeFile(`${legacy_path}.map`, JSON.stringify(map)); - } - }); - }); - }); - }); - - if (with_app_dir && helper && helper.noCopyOverride) { - helper.noCopyOverride(paths, no_copy_files); - } - - Promise.resolve() - .then(() => { - const handler = handleDir.bind(null, true, false, in_path || paths.main); - const filter = (filename, stats) => !no_copy_files.has(filename); - return walkDir(paths.vendor, handler, filter); - }) - .then(() => { - const handler = handleDir.bind(null, true, !in_path, in_path || paths.core); - const filter = (filename, stats) => !no_copy_files.has(filename); - return walkDir(paths.core, handler, filter); - }) - .then(() => { - if (!with_app_dir) return; - const handler = handleDir.bind(null, false, false, in_path); - const filter = (filename, stats) => !no_copy_files.has(filename); - return walkDir(paths.app, handler, filter); - }) - .then(() => { - if (!with_app_dir) return; - - if (!helper || !helper.appWriter) { - throw new Error(`Unable to generate app for the ${import_format} format!`); - } - - const out_app_path = path.join(legacy_path_base, 'app.js'); - console.log(`Writing ${out_app_path}`); - return helper.appWriter(out_path_base, legacy_path_base, out_app_path) - .then((extra_scripts) => { - const rel_app_path = path.relative(out_path_base, out_app_path); - const legacy_scripts = extra_scripts.concat([rel_app_path]); - transform_html(legacy_scripts, only_legacy); - }) - .then(() => { - if (!helper.removeModules) return; - console.log(`Cleaning up temporary files...`); - return Promise.all(outFiles.map((filepath) => { - unlink(filepath) - .then(() => { - // Try to clean up any empty directories if this - // was the last file in there - const rmdir_r = dir => - rmdir(dir) - .then(() => rmdir_r(path.dirname(dir))) - .catch(() => { - // Assume the error was ENOTEMPTY and ignore it - }); - return rmdir_r(path.dirname(filepath)); - }); - })); - }); - }) - .catch((err) => { - console.error(`Failure converting modules: ${err}`); - process.exit(1); - }); -} - -if (program.clean) { - console.log(`Removing ${paths.lib_dir_base}`); - fse.removeSync(paths.lib_dir_base); - - console.log(`Removing ${paths.out_dir_base}`); - fse.removeSync(paths.out_dir_base); -} - -make_lib_files(program.as, program.withSourceMaps, program.withApp, program.onlyLegacy); diff --git a/systemvm/agent/noVNC/utils/use_require_helpers.js b/systemvm/agent/noVNC/utils/use_require_helpers.js deleted file mode 100644 index a4f99c7045ca..000000000000 --- a/systemvm/agent/noVNC/utils/use_require_helpers.js +++ /dev/null @@ -1,76 +0,0 @@ -// writes helpers require for vnc.html (they should output app.js) -const fs = require('fs'); -const path = require('path'); - -// util.promisify requires Node.js 8.x, so we have our own -function promisify(original) { - return function promise_wrap() { - const args = Array.prototype.slice.call(arguments); - return new Promise((resolve, reject) => { - original.apply(this, args.concat((err, value) => { - if (err) return reject(err); - resolve(value); - })); - }); - }; -} - -const writeFile = promisify(fs.writeFile); - -module.exports = { - 'amd': { - appWriter: (base_out_path, script_base_path, out_path) => { - // setup for requirejs - const ui_path = path.relative(base_out_path, - path.join(script_base_path, 'app', 'ui')); - return writeFile(out_path, `requirejs(["${ui_path}"], (ui) => {});`) - .then(() => { - console.log(`Please place RequireJS in ${path.join(script_base_path, 'require.js')}`); - const require_path = path.relative(base_out_path, - path.join(script_base_path, 'require.js')); - return [ require_path ]; - }); - }, - noCopyOverride: () => {}, - }, - 'commonjs': { - optionsOverride: (opts) => { - // CommonJS supports properly shifting the default export to work as normal - opts.plugins.unshift("add-module-exports"); - }, - appWriter: (base_out_path, script_base_path, out_path) => { - const browserify = require('browserify'); - const b = browserify(path.join(script_base_path, 'app/ui.js'), {}); - return promisify(b.bundle).call(b) - .then(buf => writeFile(out_path, buf)) - .then(() => []); - }, - noCopyOverride: () => {}, - removeModules: true, - }, - 'systemjs': { - appWriter: (base_out_path, script_base_path, out_path) => { - const ui_path = path.relative(base_out_path, - path.join(script_base_path, 'app', 'ui.js')); - return writeFile(out_path, `SystemJS.import("${ui_path}");`) - .then(() => { - console.log(`Please place SystemJS in ${path.join(script_base_path, 'system-production.js')}`); - // FIXME: Should probably be in the legacy directory - const promise_path = path.relative(base_out_path, - path.join(base_out_path, 'vendor', 'promise.js')); - const systemjs_path = path.relative(base_out_path, - path.join(script_base_path, 'system-production.js')); - return [ promise_path, systemjs_path ]; - }); - }, - noCopyOverride: (paths, no_copy_files) => { - no_copy_files.delete(path.join(paths.vendor, 'promise.js')); - }, - }, - 'umd': { - optionsOverride: (opts) => { - // umd supports properly shifting the default export to work as normal - opts.plugins.unshift("add-module-exports"); - }, - }, -}; diff --git a/systemvm/agent/noVNC/utils/validate b/systemvm/agent/noVNC/utils/validate deleted file mode 100755 index a6b5507d2ac0..000000000000 --- a/systemvm/agent/noVNC/utils/validate +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash - -set -e - -RET=0 - -OUT=`mktemp` - -for fn in "$@"; do - echo "Validating $fn..." - echo - - case $fn in - *.html) - type="text/html" - ;; - *.css) - type="text/css" - ;; - *) - echo "Unknown format!" - echo - RET=1 - continue - ;; - esac - - curl --silent \ - --header "Content-Type: ${type}; charset=utf-8" \ - --data-binary @${fn} \ - https://validator.w3.org/nu/?out=text > $OUT - cat $OUT - echo - - # We don't fail the check for warnings as some warnings are - # not relevant for us, and we don't currently have a way to - # ignore just those - if grep -q -s -E "^Error:" $OUT; then - RET=1 - fi -done - -rm $OUT - -exit $RET diff --git a/systemvm/agent/noVNC/vendor/browser-es-module-loader/README.md b/systemvm/agent/noVNC/vendor/browser-es-module-loader/README.md index c26867f979ff..a50cc37de2ad 100644 --- a/systemvm/agent/noVNC/vendor/browser-es-module-loader/README.md +++ b/systemvm/agent/noVNC/vendor/browser-es-module-loader/README.md @@ -6,8 +6,8 @@ It's based heavily on https://github.com/ModuleLoader/browser-es-module-loader, but uses WebWorkers to compile the modules in the background. -To generate, run `rollup -c` in this directory, and then run `browserify -src/babel-worker.js > dist/babel-worker.js`. +To generate, run `npx rollup -c` in this directory, and then run +`./genworker.js`. LICENSE ------- diff --git a/systemvm/agent/noVNC/vendor/browser-es-module-loader/genworker.js b/systemvm/agent/noVNC/vendor/browser-es-module-loader/genworker.js new file mode 100755 index 000000000000..dbf5d2fc801f --- /dev/null +++ b/systemvm/agent/noVNC/vendor/browser-es-module-loader/genworker.js @@ -0,0 +1,13 @@ +#!/usr/bin/env node + +var fs = require("fs"); +var browserify = require("browserify"); + +browserify("src/babel-worker.js") + .transform("babelify", { + presets: [ [ "@babel/preset-env", { targets: "ie >= 11" } ] ], + global: true, + ignore: [ "../../node_modules/core-js" ] + }) + .bundle() + .pipe(fs.createWriteStream("dist/babel-worker.js")); diff --git a/systemvm/agent/noVNC/vendor/browser-es-module-loader/rollup.config.js b/systemvm/agent/noVNC/vendor/browser-es-module-loader/rollup.config.js index 4bf4a5fd18c1..33a4a24aa5a3 100644 --- a/systemvm/agent/noVNC/vendor/browser-es-module-loader/rollup.config.js +++ b/systemvm/agent/noVNC/vendor/browser-es-module-loader/rollup.config.js @@ -1,16 +1,15 @@ import nodeResolve from 'rollup-plugin-node-resolve'; export default { - entry: 'src/browser-es-module-loader.js', - dest: 'dist/browser-es-module-loader.js', - format: 'umd', - moduleName: 'BrowserESModuleLoader', - sourceMap: true, + input: 'src/browser-es-module-loader.js', + output: { + file: 'dist/browser-es-module-loader.js', + format: 'umd', + name: 'BrowserESModuleLoader', + sourcemap: true, + }, plugins: [ nodeResolve(), ], - - // skip rollup warnings (specifically the eval warning) - onwarn: function() {} }; diff --git a/systemvm/agent/noVNC/vendor/browser-es-module-loader/src/babel-worker.js b/systemvm/agent/noVNC/vendor/browser-es-module-loader/src/babel-worker.js index 007bd6850cb0..19e23bf6c0a0 100644 --- a/systemvm/agent/noVNC/vendor/browser-es-module-loader/src/babel-worker.js +++ b/systemvm/agent/noVNC/vendor/browser-es-module-loader/src/babel-worker.js @@ -1,12 +1,10 @@ -/*import { transform as babelTransform } from 'babel-core'; -import babelTransformDynamicImport from 'babel-plugin-syntax-dynamic-import'; -import babelTransformES2015ModulesSystemJS from 'babel-plugin-transform-es2015-modules-systemjs';*/ +// Polyfills needed for Babel to function +require("core-js"); -// sadly, due to how rollup works, we can't use es6 imports here -var babelTransform = require('babel-core').transform; -var babelTransformDynamicImport = require('babel-plugin-syntax-dynamic-import'); -var babelTransformES2015ModulesSystemJS = require('babel-plugin-transform-es2015-modules-systemjs'); -var babelPresetES2015 = require('babel-preset-es2015'); +var babelTransform = require('@babel/core').transform; +var babelTransformDynamicImport = require('@babel/plugin-syntax-dynamic-import'); +var babelTransformModulesSystemJS = require('@babel/plugin-transform-modules-systemjs'); +var babelPresetEnv = require('@babel/preset-env'); self.onmessage = function (evt) { // transform source with Babel @@ -17,8 +15,8 @@ self.onmessage = function (evt) { moduleIds: false, sourceMaps: 'inline', babelrc: false, - plugins: [babelTransformDynamicImport, babelTransformES2015ModulesSystemJS], - presets: [babelPresetES2015], + plugins: [babelTransformDynamicImport, babelTransformModulesSystemJS], + presets: [ [ babelPresetEnv, { targets: 'ie >= 11' } ] ], }); self.postMessage({key: evt.data.key, code: output.code, source: evt.data.source}); diff --git a/systemvm/agent/noVNC/vendor/browser-es-module-loader/src/browser-es-module-loader.js b/systemvm/agent/noVNC/vendor/browser-es-module-loader/src/browser-es-module-loader.js index efae617061f3..9e50b8b5b221 100644 --- a/systemvm/agent/noVNC/vendor/browser-es-module-loader/src/browser-es-module-loader.js +++ b/systemvm/agent/noVNC/vendor/browser-es-module-loader/src/browser-es-module-loader.js @@ -1,5 +1,4 @@ import RegisterLoader from 'es-module-loader/core/register-loader.js'; -import { InternalModuleNamespace as ModuleNamespace } from 'es-module-loader/core/loader-polyfill.js'; import { baseURI, global, isBrowser } from 'es-module-loader/core/common.js'; import { resolveIfNotPlain } from 'es-module-loader/core/resolve.js'; diff --git a/systemvm/agent/noVNC/vendor/pako/lib/zlib/deflate.js b/systemvm/agent/noVNC/vendor/pako/lib/zlib/deflate.js index c51915e2d948..c3a5ba49aa74 100644 --- a/systemvm/agent/noVNC/vendor/pako/lib/zlib/deflate.js +++ b/systemvm/agent/noVNC/vendor/pako/lib/zlib/deflate.js @@ -9,51 +9,51 @@ import msg from "./messages.js"; /* Allowed flush values; see deflate() and inflate() below for details */ -var Z_NO_FLUSH = 0; -var Z_PARTIAL_FLUSH = 1; -//var Z_SYNC_FLUSH = 2; -var Z_FULL_FLUSH = 3; -var Z_FINISH = 4; -var Z_BLOCK = 5; -//var Z_TREES = 6; +export const Z_NO_FLUSH = 0; +export const Z_PARTIAL_FLUSH = 1; +//export const Z_SYNC_FLUSH = 2; +export const Z_FULL_FLUSH = 3; +export const Z_FINISH = 4; +export const Z_BLOCK = 5; +//export const Z_TREES = 6; /* Return codes for the compression/decompression functions. Negative values * are errors, positive values are used for special but normal events. */ -var Z_OK = 0; -var Z_STREAM_END = 1; -//var Z_NEED_DICT = 2; -//var Z_ERRNO = -1; -var Z_STREAM_ERROR = -2; -var Z_DATA_ERROR = -3; -//var Z_MEM_ERROR = -4; -var Z_BUF_ERROR = -5; -//var Z_VERSION_ERROR = -6; +export const Z_OK = 0; +export const Z_STREAM_END = 1; +//export const Z_NEED_DICT = 2; +//export const Z_ERRNO = -1; +export const Z_STREAM_ERROR = -2; +export const Z_DATA_ERROR = -3; +//export const Z_MEM_ERROR = -4; +export const Z_BUF_ERROR = -5; +//export const Z_VERSION_ERROR = -6; /* compression levels */ -//var Z_NO_COMPRESSION = 0; -//var Z_BEST_SPEED = 1; -//var Z_BEST_COMPRESSION = 9; -var Z_DEFAULT_COMPRESSION = -1; +//export const Z_NO_COMPRESSION = 0; +//export const Z_BEST_SPEED = 1; +//export const Z_BEST_COMPRESSION = 9; +export const Z_DEFAULT_COMPRESSION = -1; -var Z_FILTERED = 1; -var Z_HUFFMAN_ONLY = 2; -var Z_RLE = 3; -var Z_FIXED = 4; -var Z_DEFAULT_STRATEGY = 0; +export const Z_FILTERED = 1; +export const Z_HUFFMAN_ONLY = 2; +export const Z_RLE = 3; +export const Z_FIXED = 4; +export const Z_DEFAULT_STRATEGY = 0; /* Possible values of the data_type field (though see inflate()) */ -//var Z_BINARY = 0; -//var Z_TEXT = 1; -//var Z_ASCII = 1; // = Z_TEXT -var Z_UNKNOWN = 2; +//export const Z_BINARY = 0; +//export const Z_TEXT = 1; +//export const Z_ASCII = 1; // = Z_TEXT +export const Z_UNKNOWN = 2; /* The deflate compression method */ -var Z_DEFLATED = 8; +export const Z_DEFLATED = 8; /*============================================================================*/ diff --git a/systemvm/agent/noVNC/vendor/pako/lib/zlib/inflate.js b/systemvm/agent/noVNC/vendor/pako/lib/zlib/inflate.js index b79b39632cf8..1d2063bc4054 100644 --- a/systemvm/agent/noVNC/vendor/pako/lib/zlib/inflate.js +++ b/systemvm/agent/noVNC/vendor/pako/lib/zlib/inflate.js @@ -13,30 +13,30 @@ var DISTS = 2; /* Allowed flush values; see deflate() and inflate() below for details */ -//var Z_NO_FLUSH = 0; -//var Z_PARTIAL_FLUSH = 1; -//var Z_SYNC_FLUSH = 2; -//var Z_FULL_FLUSH = 3; -var Z_FINISH = 4; -var Z_BLOCK = 5; -var Z_TREES = 6; +//export const Z_NO_FLUSH = 0; +//export const Z_PARTIAL_FLUSH = 1; +//export const Z_SYNC_FLUSH = 2; +//export const Z_FULL_FLUSH = 3; +export const Z_FINISH = 4; +export const Z_BLOCK = 5; +export const Z_TREES = 6; /* Return codes for the compression/decompression functions. Negative values * are errors, positive values are used for special but normal events. */ -var Z_OK = 0; -var Z_STREAM_END = 1; -var Z_NEED_DICT = 2; -//var Z_ERRNO = -1; -var Z_STREAM_ERROR = -2; -var Z_DATA_ERROR = -3; -var Z_MEM_ERROR = -4; -var Z_BUF_ERROR = -5; -//var Z_VERSION_ERROR = -6; +export const Z_OK = 0; +export const Z_STREAM_END = 1; +export const Z_NEED_DICT = 2; +//export const Z_ERRNO = -1; +export const Z_STREAM_ERROR = -2; +export const Z_DATA_ERROR = -3; +export const Z_MEM_ERROR = -4; +export const Z_BUF_ERROR = -5; +//export const Z_VERSION_ERROR = -6; /* The deflate compression method */ -var Z_DEFLATED = 8; +export const Z_DEFLATED = 8; /* STATES ====================================================================*/ diff --git a/systemvm/agent/noVNC/vnc.html b/systemvm/agent/noVNC/vnc.html index 212321bd7ffb..a244a7df82e9 100644 --- a/systemvm/agent/noVNC/vnc.html +++ b/systemvm/agent/noVNC/vnc.html @@ -4,7 +4,7 @@ + + @@ -57,23 +61,13 @@ - - + - +
    @@ -91,68 +85,54 @@
    -

    no
    VNC

    +

    no
    VNC

    - -
    - - - - - +
    -
    - -
    -
    - - - - - - -
    -
    + +
    +
    + + + + + + +
    -
    - Power + Power
    @@ -161,110 +141,132 @@

    no
    VNC

    -
    - Clipboard + Clipboard

    +
    - - -
    -
    -
      -
    • - Settings -
      • -
    • - -
      • -
    • - -
      • -
      • -
    • - -
      • -
    • - - -
      • -
      • -
    • -
      Advanced
      -
        -
      • - - -
        • -
      • -
        WebSocket
        -
          -
        • - -
          • -
        • - - -
          • -
        • - - -
          • -
        • - - -
          • -
        -
        • -
        • -
      • - -
        • -
      • - - -
        • -
        • -
      • - -
        • -
        • - -
      • - -
        • -
      -
      • -
    -
    -
    + + +
    +
    +
      +
    • + Settings +
      • +
    • + +
      • +
    • + +
      • +
      • +
    • + +
      • +
    • + + +
      • +
      • +
    • +
      Advanced
      +
        +
      • + + +
        • +
      • + + +
        • +
        • +
      • + + +
        • +
      • +
        WebSocket
        +
          +
        • + +
          • +
        • + + +
          • +
        • + + +
          • +
        • + + +
          • +
        • + + +
          • +
        +
        • +
        • +
      • + +
        • +
      • + + +
        • +
        • +
      • + +
        • +
        • + +
      • + +
        • +
      +
      • +
      • +
    • + Version: + +
      • +
    +
    +
    +     - @@ -279,25 +281,29 @@

    no
    VNC

    -
    +
    -
    +
      -
    • +
    • + + +
      • +
    • - +
    @@ -327,4 +333,9 @@

    no
    VNC

    + diff --git a/systemvm/agent/noVNC/vnc_lite.html b/systemvm/agent/noVNC/vnc_lite.html index 12ac1d53b829..0be2b53845fd 100644 --- a/systemvm/agent/noVNC/vnc_lite.html +++ b/systemvm/agent/noVNC/vnc_lite.html @@ -7,7 +7,7 @@ This is a self-contained file which doesn't import WebUtil or external CSS. - Copyright (C) 2018 The noVNC Authors + Copyright (C) 2019 The noVNC Authors noVNC is licensed under the MPL 2.0 (see LICENSE.txt) This file is licensed under the 2-Clause BSD license (see LICENSE.txt). @@ -18,6 +18,10 @@ + + +