Skip to content

whitelist stuff in CilboxSceneBasis which is commonly used in world development #556

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dooly123 merged 1 commit into from
Mar 1, 2026
Merged

whitelist stuff in CilboxSceneBasis which is commonly used in world development #556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions Basis/Packages/com.basis.shim/Shims/CilboxSceneBasis.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ public class CilboxSceneBasis : Cilbox
"Basis.SafeUtil",
"Basis.Scripts.BasisSdk.Players.BasisLocalPlayer",
"Basis.Scripts.Networking.NetworkedAvatar.BasisNetworkPlayer",
"BasisNetworkCommon+EventTiming",
"BasisSDKMirror",
"BasisSDKMirror+MirrorClearFlags",

Expand All @@ -46,13 +47,15 @@ public class CilboxSceneBasis : Cilbox
"System.Byte",
"System.Char",
"System.Collections.Generic.Dictionary",
"System.Collections.Generic.List",
"System.Convert", // HMMMMMMMMM SUSSY
"System.DateTime",
"System.DayOfWeek",
"System.Delegate",
"System.Diagnostics.Stopwatch",
"System.Double",
"System.Exception",
"System.Guid",
"System.IDisposable",
"System.Int16",
"System.Int32",
Expand All @@ -64,6 +67,7 @@ public class CilboxSceneBasis : Cilbox
"System.Math",
"System.MathF",
"System.Object",
"System.Random",
"System.Single",
"System.String",
"System.TimeSpan",
Expand All @@ -74,26 +78,42 @@ public class CilboxSceneBasis : Cilbox
"System.Void",
"<PrivateImplementationDetails>", // Probably remove me? But we need a way to handle string hashing. We can do it with our own function but that's slower.

// TMPro types
"TMPro.TextMeshPro",
"TMPro.TextMeshProUGUI",
"TMPro.TMP_Text",

// Unity types
"UnityEngine.AudioClip",
"UnityEngine.AudioSource",
"UnityEngine.Behaviour",
"UnityEngine.BoxCollider",
"UnityEngine.CapsuleCollider",
"UnityEngine.Collider",
"UnityEngine.Color",
"UnityEngine.Component",
"UnityEngine.CustomRenderTexture",
"UnityEngine.Debug",
"UnityEngine.DynamicGI",
"UnityEngine.Events.UnityAction",
"UnityEngine.Events.UnityEvent",
"UnityEngine.EventSystems.BaseEventData",
"UnityEngine.EventSystems.EventTrigger",
"UnityEngine.EventSystems.EventTrigger+Entry",
"UnityEngine.EventSystems.EventTrigger+TriggerEvent",
"UnityEngine.EventSystems.EventTriggerType",
"UnityEngine.GameObject", // Hyper restrictive.
"UnityEngine.Gradient",
"UnityEngine.LayerMask",
"UnityEngine.Light",
"UnityEngine.Material",
"UnityEngine.MaterialPropertyBlock",
"UnityEngine.Mathf",
"UnityEngine.MeshCollider",
"UnityEngine.MeshRenderer",
"UnityEngine.MonoBehaviour", // Note this is needed for the 'ctor, but we can be very restrictive.
"UnityEngine.Object",
"UnityEngine.ParticleSystem",
"UnityEngine.Quaternion",
"UnityEngine.Random",
"UnityEngine.Renderer",
Expand All @@ -110,20 +130,35 @@ public class CilboxSceneBasis : Cilbox
"UnityEngine.UI.Button+ButtonClickedEvent",
"UnityEngine.UI.InputField",
"UnityEngine.UI.InputField+OnChangeEvent",
"UnityEngine.UI.RawImage",
"UnityEngine.UI.Scrollbar",
"UnityEngine.UI.Selectable",
"UnityEngine.UI.Slider",
"UnityEngine.UI.Text",
"UnityEngine.UI.Toggle",
"UnityEngine.UI.Toggle+ToggleEvent",
"UnityEngine.Vector2",
"UnityEngine.Vector3",
"UnityEngine.Vector4",
};

static HashSet<String> whiteListFields = new HashSet<String>(){
// Basis fields
"Basis.BasisNetworkBehaviour.CurrentOwnerId",
"Basis.BasisNetworkBehaviour.IsOwnedLocallyOnServer",
"Basis.Scripts.Networking.NetworkedAvatar.BasisNetworkPlayer.playerId",

// Unity fields
"UnityEngine.EventSystems.EventTrigger+Entry.eventID",
"UnityEngine.EventSystems.EventTrigger+Entry.callback",
"UnityEngine.UI.Toggle.onValueChanged",
"UnityEngine.Vector3.x",
"UnityEngine.Vector3.y",
"UnityEngine.Vector3.z",
"UnityEngine.Vector4.x",
"UnityEngine.Vector4.y",
"UnityEngine.Vector4.z",
"UnityEngine.Vector4.w",
};

static public HashSet<String> GetWhiteListTypes() { return whiteListType; }
Expand Down
235 changes: 131 additions & 104 deletions Basis/Packages/com.basis.shim/Shims/link.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,110 +1,137 @@
<linker>
<assembly fullname="Basis Framework">
<type fullname="Basis.Scripts.Networking.NetworkedAvatar.BasisNetworkPlayer" preserve="all"/>
<type fullname="Basis.BasisNetworkBehaviour" preserve="all"/>
</assembly>
<assembly fullname="mscorlib">
<type fullname="System.Action" preserve="all"/>
<type fullname="System.Delegate" preserve="all"/>
<type fullname="System.Array" preserve="all"/>
<type fullname="System.BitConverter" preserve="all"/>
<type fullname="System.Boolean" preserve="all"/>
<type fullname="System.Byte" preserve="all"/>
<type fullname="System.Char" preserve="all"/>
<type fullname="System.Convert" preserve="all"/>
<type fullname="System.DateTime" preserve="all"/>
<type fullname="System.DayOfWeek" preserve="all"/>
<type fullname="System.Double" preserve="all"/>
<type fullname="System.Exception" preserve="all"/>
<assembly fullname="Cilbox">
<type fullname="Cilbox.CilboxPublicUtils" preserve="all"/>
</assembly>
<assembly fullname="mscorlib">
<type fullname="System.Array" preserve="all"/>
<type fullname="System.BitConverter" preserve="all"/>
<type fullname="System.Boolean" preserve="all"/>
<type fullname="System.Byte" preserve="all"/>
<type fullname="System.Char" preserve="all"/>
<type fullname="System.Convert" preserve="all"/>
<type fullname="System.DateTime" preserve="all"/>
<type fullname="System.DayOfWeek" preserve="all"/>
<type fullname="System.Double" preserve="all"/>
<type fullname="System.Exception" preserve="all"/>
<type fullname="System.Int16" preserve="all"/>
<type fullname="System.Int32" preserve="all"/>
<type fullname="System.Int64" preserve="all"/>
<type fullname="System.Math" preserve="all"/>
<type fullname="System.MathF" preserve="all"/>
<type fullname="System.Object" preserve="all"/>
<type fullname="System.Single" preserve="all"/>
<type fullname="System.String" preserve="all"/>
<type fullname="System.TimeSpan" preserve="all"/>
<type fullname="System.UInt16" preserve="all"/>
<type fullname="System.UInt32" preserve="all"/>
<type fullname="System.UInt64" preserve="all"/>
<type fullname="System.ValueTuple" preserve="all"/>
<type fullname="System.Void" preserve="all"/>
<type fullname="<PrivateImplementationDetails>" preserve="all"/>
<type fullname="System.Action" preserve="all"/>
<type fullname="System.Delegate" preserve="all"/>
<type fullname="System.Guid" preserve="all"/>
<type fullname="System.IDisposable" preserve="all"/>
<type fullname="System.IO.BinaryReader" preserve="all"/>
<type fullname="System.IO.BinaryWriter" preserve="all"/>
<type fullname="System.IO.MemoryStream" preserve="all"/>
<type fullname="System.IO.Stream" preserve="all"/>
<type fullname="System.IDisposable" preserve="all"/>
<type fullname="System.Int16" preserve="all"/>
<type fullname="System.Int32" preserve="all"/>
<type fullname="System.Int64" preserve="all"/>
<type fullname="System.Math" preserve="all"/>
<type fullname="System.MathF" preserve="all"/>
<type fullname="System.Object" preserve="all"/>
<type fullname="System.Single" preserve="all"/>
<type fullname="System.String" preserve="all"/>
<type fullname="System.TimeSpan" preserve="all"/>
<type fullname="System.UInt16" preserve="all"/>
<type fullname="System.UInt32" preserve="all"/>
<type fullname="System.UInt64" preserve="all"/>
<type fullname="System.ValueTuple" preserve="all"/>
<type fullname="System.Void" preserve="all"/>
<type fullname="<PrivateImplementationDetails>" preserve="all"/>
</assembly>
<assembly fullname="UnityEngine">
<type fullname="UnityEngine.CustomRenderTexture" preserve="all"/>
<type fullname="UnityEngine.Shader" preserve="all"/>
<type fullname="UnityEngine.Texture2DArray" preserve="all"/>
<type fullname="UnityEngine.AudioSource" preserve="all"/>
<type fullname="UnityEngine.AudioClip" preserve="all"/>
<type fullname="UnityEngine.Component" preserve="all"/>
<type fullname="UnityEngine.Color" preserve="all"/>
<type fullname="UnityEngine.Debug" preserve="all"/>
<type fullname="UnityEngine.Events.UnityAction" preserve="all"/>
<type fullname="UnityEngine.Events.UnityEvent" preserve="all"/>
<type fullname="UnityEngine.GameObject" preserve="all"/>
<type fullname="UnityEngine.Material" preserve="all"/>
<type fullname="UnityEngine.MaterialPropertyBlock" preserve="all"/>
<type fullname="UnityEngine.Mathf" preserve="all"/>
<type fullname="UnityEngine.MeshRenderer" preserve="all"/>
<type fullname="UnityEngine.MonoBehaviour" preserve="all"/>
<type fullname="UnityEngine.Object" preserve="all"/>
<type fullname="UnityEngine.Random" preserve="all"/>
<type fullname="UnityEngine.Renderer" preserve="all"/>
<type fullname="UnityEngine.Time" preserve="all"/>
<type fullname="UnityEngine.Texture" preserve="all"/>
<type fullname="UnityEngine.TextAsset" preserve="all"/>
<type fullname="UnityEngine.Texture2D" preserve="all"/>
<type fullname="UnityEngine.Transform" preserve="all"/>
<type fullname="UnityEngine.Vector4" preserve="all"/>
<type fullname="UnityEngine.Vector3" preserve="all"/>
<type fullname="UnityEngine.Vector2" preserve="all"/>
<type fullname="UnityEngine.Light" preserve="all"/>
<type fullname="UnityEngine.Quaternion" preserve="all"/>
<type fullname="UnityEngine.Behaviour" preserve="all"/>
<type fullname="UnityEngine.Gradient" preserve="all"/>
<type fullname="UnityEngine.RenderSettings" preserve="all"/>
<type fullname="UnityEngine.Rendering.AmbientMode" preserve="all"/>
<type fullname="UnityEngine.DynamicGI" preserve="all"/>
</assembly>
<assembly fullname="BasisShims">
<type fullname="Basis.BasisUrl" preserve="all"/>
<type fullname="Basis.BasisImageDownloader" preserve="all"/>
<type fullname="Basis.IBasisImageDownload" preserve="all"/>
<type fullname="Basis.SafeUtil" preserve="all"/>
<type fullname="Basis.BasisInteractableShim" preserve="all"/>
<type fullname="Basis.BasisInteractableShim+ClickEvent" preserve="all"/>
<type fullname="Basis.BasisNetworkShim" preserve="all"/>
<type fullname="Basis.BasisNetworkShim+NetworkReadyEvent" preserve="all"/>
<type fullname="Basis.BasisNetworkShim+ServerOwnershipDestroyedEvent" preserve="all"/>
<type fullname="Basis.BasisNetworkShim+OwnershipTransferEvent" preserve="all"/>
<type fullname="Basis.BasisNetworkShim+NetworkMessageEvent" preserve="all"/>
<type fullname="Basis.BasisNetworkShim+PlayerJoinedEvent" preserve="all"/>
<type fullname="Basis.BasisNetworkShim+PlayerLeftEvent" preserve="all"/>
</assembly>
<assembly fullname="BasisNetworkCore">
<type fullname="Basis.Network.Core.DeliveryMethod" preserve="all"/>
</assembly>
<assembly fullname="Cilbox">
<type fullname="Cilbox.CilboxPublicUtils" preserve="all"/>
</assembly>
<assembly fullname="netstandard">
<type fullname="System.Diagnostics.Stopwatch" preserve="all"/>
</assembly>
<assembly fullname="UnityEngine.UI">
<type fullname="UnityEngine.UI.Button+ButtonClickedEvent" preserve="all"/>
<type fullname="UnityEngine.UI.Button" preserve="all"/>
<type fullname="UnityEngine.UI.InputField" preserve="all"/>
<type fullname="UnityEngine.UI.InputField+OnChangeEvent" preserve="all"/>
<type fullname="UnityEngine.UI.Scrollbar" preserve="all"/>
<type fullname="UnityEngine.UI.Selectable" preserve="all"/>
<type fullname="UnityEngine.UI.Slider" preserve="all"/>
<type fullname="UnityEngine.UI.Text" preserve="all"/>
</assembly>
<type fullname="System.Random" preserve="all"/>
</assembly>
<assembly fullname="netstandard">
<type fullname="System.Diagnostics.Stopwatch" preserve="all"/>
</assembly>
<assembly fullname="UnityEngine">
<type fullname="UnityEngine.AudioClip" preserve="all"/>
<type fullname="UnityEngine.AudioSource" preserve="all"/>
<type fullname="UnityEngine.Color" preserve="all"/>
<type fullname="UnityEngine.Component" preserve="all"/>
<type fullname="UnityEngine.Debug" preserve="all"/>
<type fullname="UnityEngine.Events.UnityAction" preserve="all"/>
<type fullname="UnityEngine.Events.UnityEvent" preserve="all"/>
<type fullname="UnityEngine.GameObject" preserve="all"/>
<type fullname="UnityEngine.Material" preserve="all"/>
<type fullname="UnityEngine.MaterialPropertyBlock" preserve="all"/>
<type fullname="UnityEngine.Mathf" preserve="all"/>
<type fullname="UnityEngine.MeshRenderer" preserve="all"/>
<type fullname="UnityEngine.MonoBehaviour" preserve="all"/>
<type fullname="UnityEngine.Object" preserve="all"/>
<type fullname="UnityEngine.Random" preserve="all"/>
<type fullname="UnityEngine.Renderer" preserve="all"/>
<type fullname="UnityEngine.TextAsset" preserve="all"/>
<type fullname="UnityEngine.Texture" preserve="all"/>
<type fullname="UnityEngine.Texture2D" preserve="all"/>
<type fullname="UnityEngine.Time" preserve="all"/>
<type fullname="UnityEngine.Transform" preserve="all"/>
<type fullname="UnityEngine.Vector3" preserve="all"/>
<type fullname="UnityEngine.Vector4" preserve="all"/>
<type fullname="UnityEngine.Behaviour" preserve="all"/>
<type fullname="UnityEngine.BoxCollider" preserve="all"/>
<type fullname="UnityEngine.CapsuleCollider" preserve="all"/>
<type fullname="UnityEngine.Collider" preserve="all"/>
<type fullname="UnityEngine.CustomRenderTexture" preserve="all"/>
<type fullname="UnityEngine.DynamicGI" preserve="all"/>
<type fullname="UnityEngine.Gradient" preserve="all"/>
<type fullname="UnityEngine.LayerMask" preserve="all"/>
<type fullname="UnityEngine.Light" preserve="all"/>
<type fullname="UnityEngine.MeshCollider" preserve="all"/>
<type fullname="UnityEngine.ParticleSystem" preserve="all"/>
<type fullname="UnityEngine.Quaternion" preserve="all"/>
<type fullname="UnityEngine.Rendering.AmbientMode" preserve="all"/>
<type fullname="UnityEngine.RenderSettings" preserve="all"/>
<type fullname="UnityEngine.Shader" preserve="all"/>
<type fullname="UnityEngine.Texture2DArray" preserve="all"/>
<type fullname="UnityEngine.Vector2" preserve="all"/>
</assembly>
<assembly fullname="UnityEngine.UI">
<type fullname="UnityEngine.UI.Button" preserve="all"/>
<type fullname="UnityEngine.UI.Button+ButtonClickedEvent" preserve="all"/>
<type fullname="UnityEngine.UI.InputField" preserve="all"/>
<type fullname="UnityEngine.UI.InputField+OnChangeEvent" preserve="all"/>
<type fullname="UnityEngine.UI.Scrollbar" preserve="all"/>
<type fullname="UnityEngine.UI.Selectable" preserve="all"/>
<type fullname="UnityEngine.UI.Slider" preserve="all"/>
<type fullname="UnityEngine.UI.Text" preserve="all"/>
<type fullname="UnityEngine.EventSystems.BaseEventData" preserve="all"/>
<type fullname="UnityEngine.EventSystems.EventTrigger" preserve="all"/>
<type fullname="UnityEngine.EventSystems.EventTrigger+Entry" preserve="all"/>
<type fullname="UnityEngine.EventSystems.EventTrigger+TriggerEvent" preserve="all"/>
<type fullname="UnityEngine.EventSystems.EventTriggerType" preserve="all"/>
<type fullname="UnityEngine.UI.RawImage" preserve="all"/>
<type fullname="UnityEngine.UI.Toggle" preserve="all"/>
<type fullname="UnityEngine.UI.Toggle+ToggleEvent" preserve="all"/>
</assembly>
<assembly fullname="BasisShims">
<type fullname="Basis.BasisImageDownloader" preserve="all"/>
<type fullname="Basis.BasisInteractableShim" preserve="all"/>
<type fullname="Basis.BasisInteractableShim+ClickEvent" preserve="all"/>
<type fullname="Basis.BasisNetworkShim" preserve="all"/>
<type fullname="Basis.BasisNetworkShim+NetworkMessageEvent" preserve="all"/>
<type fullname="Basis.BasisNetworkShim+NetworkReadyEvent" preserve="all"/>
<type fullname="Basis.BasisNetworkShim+OwnershipTransferEvent" preserve="all"/>
<type fullname="Basis.BasisNetworkShim+PlayerJoinedEvent" preserve="all"/>
<type fullname="Basis.BasisNetworkShim+PlayerLeftEvent" preserve="all"/>
<type fullname="Basis.BasisNetworkShim+ServerOwnershipDestroyedEvent" preserve="all"/>
<type fullname="Basis.BasisUrl" preserve="all"/>
<type fullname="Basis.IBasisImageDownload" preserve="all"/>
<type fullname="Basis.SafeUtil" preserve="all"/>
</assembly>
<assembly fullname="Basis Framework">
<type fullname="Basis.BasisNetworkBehaviour" preserve="all"/>
<type fullname="Basis.Scripts.BasisSdk.Players.BasisLocalPlayer" preserve="all"/>
<type fullname="Basis.Scripts.Networking.NetworkedAvatar.BasisNetworkPlayer" preserve="all"/>
<type fullname="BasisNetworkCommon+EventTiming" preserve="all"/>
</assembly>
<assembly fullname="BasisNetworkCore">
<type fullname="Basis.Network.Core.DeliveryMethod" preserve="all"/>
</assembly>
<assembly fullname="BasisExamples">
<type fullname="BasisSDKMirror" preserve="all"/>
<type fullname="BasisSDKMirror+MirrorClearFlags" preserve="all"/>
</assembly>
<assembly fullname="Unity.TextMeshPro">
<type fullname="TMPro.TextMeshPro" preserve="all"/>
<type fullname="TMPro.TextMeshProUGUI" preserve="all"/>
<type fullname="TMPro.TMP_Text" preserve="all"/>
</assembly>
</linker>
Loading