supply correct envInfo on Android (#98)

ziti-android/src/main/java/org/openziti/android/AndroidSystemInfoProvider.kt

@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2018-2020 NetFoundry, Inc.
+ *
+ * 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
+ *
+ *     https://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.
+ */
+
+package org.openziti.android
+
+import android.os.Build
+import org.openziti.util.SystemInfo
+import org.openziti.util.SystemInfoProvider
+
+class AndroidSystemInfoProvider: SystemInfoProvider {
+    override fun getSystemInfo(): SystemInfo = SystemInfo("Android",
+        Build.VERSION.RELEASE,
+        Build.VERSION.SECURITY_PATCH,
+        System.getProperty("os.arch") ?: ""
+        )
+}

ziti-android/src/main/resources/META-INF/services/org.openziti.util.SystemInfoProvider

@@ -0,0 +1,33 @@
+#
+# Copyright (c) 2018-2020 NetFoundry, Inc.
+#
+# 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
+#
+#     https://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.
+#
+
+#
+# Copyright (c) 2018-2020 NetFoundry, Inc.
+#
+# 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
+#
+#     https://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.
+#
+
+org.openziti.android.AndroidSystemInfoProvider

ziti/src/main/kotlin/org/openziti/api/Controller.kt

@@ -30,6 +30,7 @@ import org.openziti.getZitiError
 import org.openziti.net.nio.AsychChannelSocket
 import org.openziti.net.nio.AsyncTLSSocketFactory
 import org.openziti.util.Logged
+import org.openziti.util.SystemInfoProvider
 import org.openziti.util.Version
 import org.openziti.util.ZitiLog
 import retrofit2.Call
@@ -257,12 +258,7 @@ class Controller(endpoint: URL, sslContext: SSLContext, trustManager: X509TrustM
 
     private fun getClientInfo(): ClientInfo = ClientInfo(
         sdkInfo = SdkInfo,
-        envInfo = mapOf(
-            "os" to System.getProperty("os.name"),
-            "osRelease" to System.getProperty("java.vm.version"),
-            "osVersion" to System.getProperty("os.version"),
-            "arch" to System.getProperty("os.arch")
-        ),
+        envInfo = SystemInfoProvider().getSystemInfo(),
         configTypes = arrayOf(InterceptConfig)
     )
 }

ziti/src/main/kotlin/org/openziti/api/types.kt

@@ -23,6 +23,7 @@ import com.google.gson.annotations.JsonAdapter
 import com.google.gson.annotations.SerializedName
 import com.google.gson.stream.JsonReader
 import com.google.gson.stream.JsonWriter
+import org.openziti.util.SystemInfo
 import java.util.*
 
 internal const val InterceptConfig = "ziti-tunneler-client.v1"
@@ -38,7 +39,7 @@ enum class PostureQueryType {
     PROCESS
 }
 
-internal data class ClientInfo(val sdkInfo: Map<*, *>, val envInfo: Map<*, *>, val configTypes: Array<String>)
+internal data class ClientInfo(val sdkInfo: Map<*, *>, val envInfo: SystemInfo, val configTypes: Array<String>)
 
 internal class Response<T>(val meta: Meta, val data: T?, val error: Error?)
 internal data class Error(val code: String, val message: String, val cause: JsonObject, val field: String?)

ziti/src/main/kotlin/org/openziti/util/SystemInfo.kt

@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2018-2020 NetFoundry, Inc.
+ *
+ * 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
+ *
+ *     https://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.
+ */
+
+package org.openziti.util
+
+import java.util.*
+
+data class SystemInfo(val os: String, val osRelease: String, val osVersion: String, val arch: String)
+
+interface SystemInfoProvider {
+    fun getSystemInfo(): SystemInfo
+}
+
+internal class DefaultSystemInfoProvider: SystemInfoProvider {
+    override fun getSystemInfo(): SystemInfo = SystemInfo(
+        System.getProperty("os.name", ""),
+        System.getProperty("java.vm.version", ""),
+        System.getProperty("os.version", ""),
+        System.getProperty("os.arch", "")
+
+    )
+}
+
+fun SystemInfoProvider(): SystemInfoProvider {
+    val l = ServiceLoader.load(SystemInfoProvider::class.java).toList()
+    return if (l.isEmpty()) {
+        DefaultSystemInfoProvider()
+    } else {
+        l.first()
+    }
+}