Adding upstream version 124.0.1.upstream/124.0.1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 207 insertions, 0 deletions

diff --git a/third_party/libwebrtc/examples/turnserver/read_auth_file.cc b/third_party/libwebrtc/examples/turnserver/read_auth_file.cc
new file mode 100644
index 0000000000..4b0b21b8ae
--- /dev/null
+++ b/third_party/libwebrtc/examples/turnserver/read_auth_file.cc
@@ -0,0 +1,37 @@
+/*
+ *  Copyright 2018 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "examples/turnserver/read_auth_file.h"
+
+#include <stddef.h>
+
+#include "absl/strings/string_view.h"
+#include "api/array_view.h"
+#include "rtc_base/string_encode.h"
+
+namespace webrtc_examples {
+
+std::map<std::string, std::string> ReadAuthFile(std::istream* s) {
+  std::map<std::string, std::string> name_to_key;
+  for (std::string line; std::getline(*s, line);) {
+    const size_t sep = line.find('=');
+    if (sep == std::string::npos)
+      continue;
+    char buf[32];
+    size_t len = rtc::hex_decode(rtc::ArrayView<char>(buf),
+                                 absl::string_view(line).substr(sep + 1));
+    if (len > 0) {
+      name_to_key.emplace(line.substr(0, sep), std::string(buf, len));
+    }
+  }
+  return name_to_key;
+}
+
+}  // namespace webrtc_examples
diff --git a/third_party/libwebrtc/examples/turnserver/read_auth_file.h b/third_party/libwebrtc/examples/turnserver/read_auth_file.h
new file mode 100644
index 0000000000..1c139c9924
--- /dev/null
+++ b/third_party/libwebrtc/examples/turnserver/read_auth_file.h
@@ -0,0 +1,24 @@
+/*
+ *  Copyright 2018 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#ifndef EXAMPLES_TURNSERVER_READ_AUTH_FILE_H_
+#define EXAMPLES_TURNSERVER_READ_AUTH_FILE_H_
+
+#include <istream>
+#include <map>
+#include <string>
+
+namespace webrtc_examples {
+
+std::map<std::string, std::string> ReadAuthFile(std::istream* s);
+
+}  // namespace webrtc_examples
+
+#endif  // EXAMPLES_TURNSERVER_READ_AUTH_FILE_H_
diff --git a/third_party/libwebrtc/examples/turnserver/read_auth_file_unittest.cc b/third_party/libwebrtc/examples/turnserver/read_auth_file_unittest.cc
new file mode 100644
index 0000000000..23b026429b
--- /dev/null
+++ b/third_party/libwebrtc/examples/turnserver/read_auth_file_unittest.cc
@@ -0,0 +1,45 @@
+/*
+ *  Copyright 2018 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "examples/turnserver/read_auth_file.h"
+
+#include <sstream>
+
+#include "test/gtest.h"
+
+namespace webrtc_examples {
+
+TEST(ReadAuthFile, HandlesEmptyFile) {
+  std::istringstream empty;
+  auto map = ReadAuthFile(&empty);
+  EXPECT_TRUE(map.empty());
+}
+
+TEST(ReadAuthFile, RecognizesValidUser) {
+  std::istringstream file("foo=deadbeaf\n");
+  auto map = ReadAuthFile(&file);
+  ASSERT_NE(map.find("foo"), map.end());
+  EXPECT_EQ(map["foo"], "\xde\xad\xbe\xaf");
+}
+
+TEST(ReadAuthFile, EmptyValueForInvalidHex) {
+  std::istringstream file(
+      "foo=deadbeaf\n"
+      "bar=xxxxinvalidhex\n"
+      "baz=cafe\n");
+  auto map = ReadAuthFile(&file);
+  ASSERT_NE(map.find("foo"), map.end());
+  EXPECT_EQ(map["foo"], "\xde\xad\xbe\xaf");
+  EXPECT_EQ(map.find("bar"), map.end());
+  ASSERT_NE(map.find("baz"), map.end());
+  EXPECT_EQ(map["baz"], "\xca\xfe");
+}
+
+}  // namespace webrtc_examples
diff --git a/third_party/libwebrtc/examples/turnserver/turnserver_main.cc b/third_party/libwebrtc/examples/turnserver/turnserver_main.cc
new file mode 100644
index 0000000000..8db6162306
--- /dev/null
+++ b/third_party/libwebrtc/examples/turnserver/turnserver_main.cc
@@ -0,0 +1,101 @@
+/*
+ *  Copyright 2012 The WebRTC Project Authors. All rights reserved.
+ *
+ *  Use of this source code is governed by a BSD-style license
+ *  that can be found in the LICENSE file in the root of the source
+ *  tree. An additional intellectual property rights grant can be found
+ *  in the file PATENTS.  All contributing project authors may
+ *  be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include <fstream>
+#include <iostream>
+#include <map>
+#include <string>
+#include <utility>
+
+#include "absl/strings/string_view.h"
+#include "examples/turnserver/read_auth_file.h"
+#include "p2p/base/basic_packet_socket_factory.h"
+#include "p2p/base/port_interface.h"
+#include "p2p/base/turn_server.h"
+#include "rtc_base/async_udp_socket.h"
+#include "rtc_base/ip_address.h"
+#include "rtc_base/physical_socket_server.h"
+#include "rtc_base/socket_address.h"
+#include "rtc_base/thread.h"
+
+namespace {
+const char kSoftware[] = "libjingle TurnServer";
+
+class TurnFileAuth : public cricket::TurnAuthInterface {
+ public:
+  explicit TurnFileAuth(std::map<std::string, std::string> name_to_key)
+      : name_to_key_(std::move(name_to_key)) {}
+
+  virtual bool GetKey(absl::string_view username,
+                      absl::string_view realm,
+                      std::string* key) {
+    // File is stored as lines of <username>=<HA1>.
+    // Generate HA1 via "echo -n "<username>:<realm>:<password>" | md5sum"
+    auto it = name_to_key_.find(std::string(username));
+    if (it == name_to_key_.end())
+      return false;
+    *key = it->second;
+    return true;
+  }
+
+ private:
+  const std::map<std::string, std::string> name_to_key_;
+};
+
+}  // namespace
+
+int main(int argc, char* argv[]) {
+  if (argc != 5) {
+    std::cerr << "usage: turnserver int-addr ext-ip realm auth-file"
+              << std::endl;
+    return 1;
+  }
+
+  rtc::SocketAddress int_addr;
+  if (!int_addr.FromString(argv[1])) {
+    std::cerr << "Unable to parse IP address: " << argv[1] << std::endl;
+    return 1;
+  }
+
+  rtc::IPAddress ext_addr;
+  if (!IPFromString(argv[2], &ext_addr)) {
+    std::cerr << "Unable to parse IP address: " << argv[2] << std::endl;
+    return 1;
+  }
+
+  rtc::PhysicalSocketServer socket_server;
+  rtc::AutoSocketServerThread main(&socket_server);
+  rtc::AsyncUDPSocket* int_socket =
+      rtc::AsyncUDPSocket::Create(&socket_server, int_addr);
+  if (!int_socket) {
+    std::cerr << "Failed to create a UDP socket bound at" << int_addr.ToString()
+              << std::endl;
+    return 1;
+  }
+
+  cricket::TurnServer server(&main);
+  std::fstream auth_file(argv[4], std::fstream::in);
+
+  TurnFileAuth auth(auth_file.is_open()
+                        ? webrtc_examples::ReadAuthFile(&auth_file)
+                        : std::map<std::string, std::string>());
+  server.set_realm(argv[3]);
+  server.set_software(kSoftware);
+  server.set_auth_hook(&auth);
+  server.AddInternalSocket(int_socket, cricket::PROTO_UDP);
+  server.SetExternalSocketFactory(
+      new rtc::BasicPacketSocketFactory(&socket_server),
+      rtc::SocketAddress(ext_addr, 0));
+
+  std::cout << "Listening internally at " << int_addr.ToString() << std::endl;
+
+  main.Run();
+  return 0;
+}