From d7acb7cfc5064566f2a319006679bf576453b11f Mon Sep 17 00:00:00 2001
From: Simon Walton <simon@highfidelity.io>
Date: Fri, 14 Dec 2018 17:14:34 -0800
Subject: [PATCH] Deobfuscate packets in wireshark lua plugin

---
 tools/dissectors/1-hfudt.lua | 36 ++++++++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/tools/dissectors/1-hfudt.lua b/tools/dissectors/1-hfudt.lua
index 3993b2d7a0..fe8a72682d 100644
--- a/tools/dissectors/1-hfudt.lua
+++ b/tools/dissectors/1-hfudt.lua
@@ -77,7 +77,7 @@ local packet_types = {
   [22] = "ICEServerPeerInformation",
   [23] = "ICEServerQuery",
   [24] = "OctreeStats",
-  [25] = "UNUSED_PACKET_TYPE_1",
+  [25] = "SetAvatarTraits",
   [26] = "AvatarIdentityRequest",
   [27] = "AssignmentClientStatus",
   [28] = "NoisyMute",
@@ -229,7 +229,7 @@ function p_hfudt.dissector(buf, pinfo, tree)
     -- read the obfuscation level
     local obfuscation_bits = bit32.band(0x03, bit32.rshift(first_word, 27))
     subtree:add(f_obfuscation_level, obfuscation_bits)
-
+    
     -- read the sequence number
     subtree:add(f_sequence_number, bit32.band(first_word, SEQUENCE_NUMBER_MASK))
 
@@ -257,6 +257,11 @@ function p_hfudt.dissector(buf, pinfo, tree)
       subtree:add(f_message_part_number, buf(8, 4):le_uint())
     end
 
+    if obfuscation_bits ~= 0 then
+      local newbuf = deobfuscate(message_bit, buf, obfuscation_bits)
+      buf = newbuf:tvb("Unobfuscated")
+    end
+
     -- read the type
     local packet_type = buf(payload_offset, 1):le_uint()
     local ptype = subtree:add_le(f_type, buf(payload_offset, 1))
@@ -316,3 +321,30 @@ function p_hfudt.init()
     udp_dissector_table:add(port, p_hfudt)
   end
 end
+
+function deobfuscate(message_bit, buf, level)
+  local out = ByteArray.new()
+  out:set_size(buf:len())
+  if (level == 1) then
+    key = ByteArray.new("6362726973736574")
+  elseif level == 2 then
+    key = ByteArray.new("7362697261726461")
+  elseif level == 3 then
+    key = ByteArray.new("72687566666d616e")
+  else
+    return
+  end
+  
+  local start = 4
+  if message_bit == 1 then
+    local start = 12
+  end
+  
+  local p = 0
+  for i = start, buf:len() - 1 do
+    out:set_index(i, bit.bxor(buf(i, 1):le_uint(), key:get_index(7 - (p % 8))) )
+    p = p + 1
+  end
+
+  return out
+end