Merge branch 'update-mastofe/glitch-soc-2019-02-10' into 'develop'

[akkoma] / lib / pleroma / flake_id.ex

diff --git a/lib/pleroma/flake_id.ex b/lib/pleroma/flake_id.ex
index 3c72807caef18ff64905e8fb754c0759be24974e..9f098ce3378f0ce5deeb2ea2bb03e9804e56f80d 100644 (file)
--- a/lib/pleroma/flake_id.ex
+++ b/lib/pleroma/flake_id.ex
@@ -1,3 +1,7 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Pleroma.FlakeId do
   @moduledoc """
   Flake is a decentralized, k-ordered id generation service.
@@ -23,14 +27,14 @@ defmodule Pleroma.FlakeId do
     Kernel.to_string(id)
   end
 
-  def to_string(flake = <<_::integer-size(64), _::integer-size(48), _::integer-size(16)>>) do
+  def to_string(<<_::integer-size(64), _::integer-size(48), _::integer-size(16)>> = flake) do
     encode_base62(flake)
   end
 
   def to_string(s), do: s
 
-  def from_string(<<id::integer-size(64)>>) do
-    <<0::integer-size(64), id::integer-size(64)>>
+  def from_string(int) when is_integer(int) do
+    from_string(Kernel.to_string(int))
   end
 
   for i <- [-1, 0] do
@@ -38,6 +42,8 @@ defmodule Pleroma.FlakeId do
     def from_string(unquote(Kernel.to_string(i))), do: <<0::integer-size(128)>>
   end
 
+  def from_string(<<_::integer-size(128)>> = flake), do: flake
+
   def from_string(string) when is_binary(string) and byte_size(string) < 18 do
     case Integer.parse(string) do
       {id, _} -> <<0::integer-size(64), id::integer-size(64)>>
@@ -88,7 +94,7 @@ defmodule Pleroma.FlakeId do
 
   @impl GenServer
   def init([]) do
-    {:ok, %FlakeId{node: mac(), time: time()}}
+    {:ok, %FlakeId{node: worker_id(), time: time()}}
   end
 
   @impl GenServer
@@ -159,23 +165,8 @@ defmodule Pleroma.FlakeId do
     1_000_000_000 * mega_seconds + seconds * 1000 + :erlang.trunc(micro_seconds / 1000)
   end
 
-  defp mac do
-    {:ok, addresses} = :inet.getifaddrs()
-
-    ifaces_with_mac =
-      Enum.reduce(addresses, [], fn {iface, attrs}, acc ->
-        if attrs[:hwaddr], do: [iface | acc], else: acc
-      end)
-
-    iface = Enum.at(ifaces_with_mac, :rand.uniform(length(ifaces_with_mac)) - 1)
-    mac(iface)
-  end
-
-  defp mac(name) do
-    {:ok, addresses} = :inet.getifaddrs()
-    proplist = :proplists.get_value(name, addresses)
-    hwaddr = Enum.take(:proplists.get_value(:hwaddr, proplist), 6)
-    <<worker::integer-size(48)>> = :binary.list_to_bin(hwaddr)
+  defp worker_id() do
+    <<worker::integer-size(48)>> = :crypto.strong_rand_bytes(6)
     worker
   end
 end