mirror of
https://github.com/nestriness/cdc-file-transfer.git
synced 2026-01-30 14:15:36 +02:00
f8438aec66
This CL removes the port arguments for both tools. The port argument can also be specified via the ssh-command and scp-command flags. In fact, if a port is specified by both port flags and ssh/scp commands, they interfere with each other. For ssh, the one specified in ssh-command wins. For scp, the one specified in scp-command wins. To fix this, one would have to parse scp-command and remove the port arg there. Or we could just remove the ssh-port arg. This is what this CL does. Note that if you need a custom port, it's very likely that you also have to define custom ssh and scp commands.
132 lines
5.2 KiB
C++
132 lines
5.2 KiB
C++
// Copyright 2022 Google LLC
|
|
//
|
|
// Licensed 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.
|
|
|
|
#include "common/remote_util.h"
|
|
|
|
#include "absl/strings/match.h"
|
|
#include "common/log.h"
|
|
#include "gtest/gtest.h"
|
|
|
|
namespace cdc_ft {
|
|
namespace {
|
|
|
|
constexpr char kUserHost[] = "user@example.com";
|
|
constexpr char kUserHostArg[] = "\"user@example.com\"";
|
|
|
|
constexpr int kLocalPort = 23456;
|
|
constexpr int kRemotePort = 34567;
|
|
constexpr bool kRegular = false; // Regular port forwarding
|
|
constexpr bool kReverse = true; // Reverse port forwarding
|
|
constexpr char kPortForwardingArg[] = "-L23456:localhost:34567";
|
|
constexpr char kReversePortForwardingArg[] = "-R34567:localhost:23456";
|
|
|
|
constexpr char kCommand[] = "my_command";
|
|
|
|
class RemoteUtilTest : public ::testing::Test {
|
|
public:
|
|
RemoteUtilTest()
|
|
: util_(kUserHost, /*verbosity=*/0, /*quiet=*/false, &process_factory_,
|
|
/*forward_output_to_log=*/true) {}
|
|
|
|
void SetUp() override {
|
|
Log::Initialize(std::make_unique<ConsoleLog>(LogLevel::kInfo));
|
|
}
|
|
|
|
void TearDown() override { Log::Shutdown(); }
|
|
|
|
protected:
|
|
void ExpectContains(const std::string& str, std::vector<const char*> tokens) {
|
|
for (const char* token : tokens) {
|
|
EXPECT_TRUE(absl::StrContains(str, token))
|
|
<< str << "\ndoes not contain\n"
|
|
<< token;
|
|
}
|
|
}
|
|
|
|
WinProcessFactory process_factory_;
|
|
RemoteUtil util_;
|
|
};
|
|
|
|
TEST_F(RemoteUtilTest, BuildProcessStartInfoForSsh) {
|
|
ProcessStartInfo si = util_.BuildProcessStartInfoForSsh(kCommand);
|
|
ExpectContains(si.command, {"ssh", kUserHostArg, kCommand});
|
|
}
|
|
|
|
TEST_F(RemoteUtilTest, BuildProcessStartInfoForSshPortForward) {
|
|
ProcessStartInfo si = util_.BuildProcessStartInfoForSshPortForward(
|
|
kLocalPort, kRemotePort, kRegular);
|
|
ExpectContains(si.command, {"ssh", kUserHostArg, kPortForwardingArg});
|
|
|
|
si = util_.BuildProcessStartInfoForSshPortForward(kLocalPort, kRemotePort,
|
|
kReverse);
|
|
ExpectContains(si.command, {"ssh", kUserHostArg, kReversePortForwardingArg});
|
|
}
|
|
|
|
TEST_F(RemoteUtilTest, BuildProcessStartInfoForSshPortForwardAndCommand) {
|
|
ProcessStartInfo si = util_.BuildProcessStartInfoForSshPortForwardAndCommand(
|
|
kLocalPort, kRemotePort, kRegular, kCommand);
|
|
ExpectContains(si.command,
|
|
{"ssh", kUserHostArg, kPortForwardingArg, kCommand});
|
|
|
|
si = util_.BuildProcessStartInfoForSshPortForwardAndCommand(
|
|
kLocalPort, kRemotePort, kReverse, kCommand);
|
|
ExpectContains(si.command,
|
|
{"ssh", kUserHostArg, kReversePortForwardingArg, kCommand});
|
|
}
|
|
TEST_F(RemoteUtilTest, BuildProcessStartInfoForSshWithCustomCommand) {
|
|
constexpr char kCustomSshCmd[] = "C:\\path\\to\\ssh.exe --fooarg --bararg=42";
|
|
util_.SetSshCommand(kCustomSshCmd);
|
|
ProcessStartInfo si = util_.BuildProcessStartInfoForSsh(kCommand);
|
|
ExpectContains(si.command, {kCustomSshCmd});
|
|
}
|
|
|
|
TEST_F(RemoteUtilTest, QuoteForWindows) {
|
|
EXPECT_EQ(RemoteUtil::QuoteForWindows("foo"), "\"foo\"");
|
|
EXPECT_EQ(RemoteUtil::QuoteForWindows("foo bar"), "\"foo bar\"");
|
|
EXPECT_EQ(RemoteUtil::QuoteForWindows("foo\\bar"), "\"foo\\bar\"");
|
|
EXPECT_EQ(RemoteUtil::QuoteForWindows("\\\\foo"), "\"\\\\foo\"");
|
|
EXPECT_EQ(RemoteUtil::QuoteForWindows("foo\\"), "\"foo\\\\\"");
|
|
EXPECT_EQ(RemoteUtil::QuoteForWindows("foo\\\\"), "\"foo\\\\\\\\\"");
|
|
EXPECT_EQ(RemoteUtil::QuoteForWindows("foo\""), "\"foo\\\"\"");
|
|
EXPECT_EQ(RemoteUtil::QuoteForWindows("foo\"bar"), "\"foo\\\"bar\"");
|
|
EXPECT_EQ(RemoteUtil::QuoteForWindows("foo\\\"bar"), "\"foo\\\\\\\"bar\"");
|
|
EXPECT_EQ(RemoteUtil::QuoteForWindows("foo\\\\\"bar"),
|
|
"\"foo\\\\\\\\\\\"bar\"");
|
|
EXPECT_EQ(RemoteUtil::QuoteForWindows("\"foo\""), "\"\\\"foo\\\"\"");
|
|
EXPECT_EQ(RemoteUtil::QuoteForWindows("\" \\file.txt"),
|
|
"\"\\\" \\file.txt\"");
|
|
}
|
|
|
|
TEST_F(RemoteUtilTest, QuoteForSsh) {
|
|
EXPECT_EQ(RemoteUtil::QuoteForSsh("foo"), "\"\\\"foo\\\"\"");
|
|
EXPECT_EQ(RemoteUtil::QuoteForSsh("foo\\bar"), "\"\\\"foo\\\\bar\\\"\"");
|
|
EXPECT_EQ(RemoteUtil::QuoteForSsh("foo\\"), "\"\\\"foo\\\\\\\\\\\"\"");
|
|
EXPECT_EQ(RemoteUtil::QuoteForSsh("foo\\\"bar"),
|
|
"\"\\\"foo\\\\\\\\\\\\\\\"bar\\\"\"");
|
|
EXPECT_EQ(RemoteUtil::QuoteForSsh("~"), "\"~\"");
|
|
EXPECT_EQ(RemoteUtil::QuoteForSsh("~username"), "\"~username\"");
|
|
EXPECT_EQ(RemoteUtil::QuoteForSsh("~/foo"), "\"~/\\\"foo\\\"\"");
|
|
EXPECT_EQ(RemoteUtil::QuoteForSsh("~username/foo"),
|
|
"\"~username/\\\"foo\\\"\"");
|
|
EXPECT_EQ(RemoteUtil::QuoteForSsh("~invalid user name"),
|
|
"\"\\\"~invalid user name\\\"\"");
|
|
EXPECT_EQ(RemoteUtil::QuoteForSsh("~invalid user name/foo"),
|
|
"\"\\\"~invalid user name/foo\\\"\"");
|
|
EXPECT_EQ(RemoteUtil::QuoteForSsh("~user-name69/foo"),
|
|
"\"~user-name69/\\\"foo\\\"\""); // Nice!
|
|
}
|
|
|
|
} // namespace
|
|
} // namespace cdc_ft
|