912b2fbc30
Previously, there was a set of headers used: * ubi-command-execute: For the command to execute * ubi-command-arg: For the argument to the command * ubi-command-argv-tail: For the argv index to include the rest of argv in command * ubi-command-argv-initial: For the argv index to include before the argument to the command This was too limiting, as it doesn't allow specifying both options and arguments to exec-ed commands. This changes things so that ubi-command-execute still specifies the command, but the arguments are passed in the response body, separated by "\0". The client checks each argument for validity: * At least one argument must be "--" * At most one argument not already present in argv is allowed * The argument not already present in argv must be after "--" So the worst a malicious server can do is rearrange argument order and insert a single new argument, which will be parsed as an argument and not as an option. That's about the same security as before, with a lot less complexity and a lot more flexibility. Use the new flexibility to support passing options to the vm ssh, vm sftp, and vm scp commands: vm ssh location vm-name -A -- vm sftp location vm-name -A vm scp location vm-name local-path :remote-path -A For vm ssh, the -- is required to separate ssh options from ssh arguments. In addition to making the code significantly less complex, this makes the specs much more understandable. To ease debugging of bin/ubi, add support for an UBI_DEBUG environment variable, which will print the arguments passed to Process.exec, so you can more easily confirm correct behavior.
25 lines
891 B
Ruby
25 lines
891 B
Ruby
# frozen_string_literal: true
|
|
|
|
require_relative "../spec_helper"
|
|
|
|
RSpec.describe Clover, "cli vm sftp" do
|
|
before do
|
|
@vm = create_vm(project_id: @project.id, ephemeral_net6: "128:1234::0/64")
|
|
subnet = @project.default_private_subnet(@vm.location)
|
|
nic = Prog::Vnet::NicNexus.assemble(subnet.id, name: "test-nic").subject
|
|
nic.update(vm_id: @vm.id)
|
|
end
|
|
|
|
it "provides headers to connect to vm via sftp" do
|
|
expect(cli_exec(["vm", "sftp", @vm.display_location, @vm.name])).to eq %w[sftp -- ubi@[128:1234::2]]
|
|
end
|
|
|
|
it "IPv4 address is used by default if available" do
|
|
add_ipv4_to_vm(@vm, "128.0.0.1")
|
|
expect(cli_exec(["vm", "sftp", @vm.display_location, @vm.name])).to eq %w[sftp -- ubi@128.0.0.1]
|
|
end
|
|
|
|
it "supports sftp options" do
|
|
expect(cli_exec(["vm", "sftp", @vm.display_location, @vm.name, "-A"])).to eq %w[sftp -A -- ubi@[128:1234::2]]
|
|
end
|
|
end
|