pakstr 0.8.5 → 0.8.7

package/android-template/app/src/main/java/com/pakstr/app/MainActivity.kt

@@ -190,7 +190,6 @@ class MainActivity : AppCompatActivity(), PermissionHandler {
 
             val remainingDuration = SupportUnlock.remainingDuration(this)
             if (!BuildConfig.DEBUG &&
-                !RuntimeConfig.debugEnabled(this) &&
                 remainingDuration > 0L
             ) {
                 diagnosticsHandler.postDelayed(
@@ -210,6 +209,7 @@ class MainActivity : AppCompatActivity(), PermissionHandler {
     private fun setupSupportUnlockGesture() {
         supportUnlockGestureLayout.onUnlock = {
             SupportUnlock.unlock(this)
+            WebViewDebugManager.enable(this)
             Toast.makeText(
                 this,
                 R.string.diagnostics_mode_enabled,
@@ -290,6 +290,7 @@ class MainActivity : AppCompatActivity(), PermissionHandler {
     override fun onResume() {
         super.onResume()
 
+        WebViewDebugManager.enable(this)
         if (::fab.isInitialized) {
             showDebugFab()
         }

package/android-template/app/src/main/java/com/pakstr/app/RuntimeConfig.kt

@@ -14,7 +14,7 @@ object RuntimeConfig {
     fun load(context: Context): JSONObject {
 
         config?.let {
-            Log.d(TAG, "Returning cached config: $it")
+            debug("Returning cached config")
             return it
         }
 
@@ -33,8 +33,9 @@ object RuntimeConfig {
 
         } catch (e: Exception) {
 
-            Log.e(
-                TAG, "Failed loading runtime config", e
+            debugError(
+                "Failed loading runtime config",
+                e
             )
 
             JSONObject()
@@ -42,9 +43,7 @@ object RuntimeConfig {
         }
 
 
-        Log.d(
-            TAG, "FINAL CONFIG: $config"
-        )
+        debug("Runtime config loaded")
 
 
         return config!!
@@ -66,9 +65,7 @@ object RuntimeConfig {
             )
 
 
-        Log.d(
-            TAG, "apiBase=$value"
-        )
+        debug("apiBase=$value")
 
 
         return value.takeIf {
@@ -86,9 +83,7 @@ object RuntimeConfig {
         val enabled = !apiBase(context).isNullOrBlank()
 
 
-        Log.d(
-            TAG, "apiEnabled=$enabled"
-        )
+        debug("apiEnabled=$enabled")
 
 
         return enabled
@@ -106,9 +101,7 @@ object RuntimeConfig {
             )
 
 
-        Log.d(
-            TAG, "relayUrl=$relay"
-        )
+        debug("relayUrl=$relay")
 
 
         return relay
@@ -142,13 +135,7 @@ object RuntimeConfig {
 
                 ?: false
 
-        Log.d(
-
-            TAG,
-
-            "debugEnabled=$enabled"
-
-        )
+        debug("debugEnabled=$enabled")
 
         return enabled
 
@@ -162,9 +149,19 @@ object RuntimeConfig {
 
         config = null
 
-        Log.d(
-            TAG, "Config cache cleared"
-        )
+        debug("Config cache cleared")
+    }
+
+    private fun debug(message: String) {
+        if (BuildConfig.DEBUG) {
+            Log.d(TAG, message)
+        }
+    }
+
+    private fun debugError(message: String, throwable: Throwable) {
+        if (BuildConfig.DEBUG) {
+            Log.e(TAG, message, throwable)
+        }
     }
 
     fun debugConfig(

package/android-template/app/src/main/java/com/pakstr/app/WebViewController.kt

@@ -95,7 +95,9 @@ class WebViewController(
                         nip07Injected = injectNip07()
 
                     }
-                    injectDebugLogger()
+                    if (AppDebugLogger.isWebViewLoggingEnabled(context)) {
+                        injectDebugLogger()
+                    }
                 }
 
                 override fun onReceivedHttpError(

package/android-template/app/src/main/java/com/pakstr/app/debug/AppDebugLogger.kt

@@ -33,16 +33,18 @@ object AppDebugLogger {
             return
         }
 
+        val sanitized = sanitize(message)
+
         save(
             context,
             "DEBUG",
             tag,
-            message
+            sanitized
         )
 
         Log.d(
             TAG,
-            "[$tag] $message"
+            "[$tag] $sanitized"
         )
     }
 
@@ -61,20 +63,20 @@ object AppDebugLogger {
             } else {
                 message
             }
+        val sanitized = sanitize(fullMessage)
 
 
         save(
             context,
             "ERROR",
             tag,
-            fullMessage
+            sanitized
         )
 
 
         Log.e(
             TAG,
-            "[$tag] $message",
-            throwable
+            "[$tag] $sanitized"
         )
     }
 
@@ -85,14 +87,11 @@ object AppDebugLogger {
         message: String
     ) {
 
-        val sanitized =
-            sanitize(message)
-
         val entry =
             format(
                 level,
                 tag,
-                sanitized
+                message
             )
 
 
@@ -136,64 +135,62 @@ object AppDebugLogger {
 
     }
 
-    private fun sanitize(
+    internal fun sanitize(
         message: String
     ): String {
 
-        // Debug build može vidjeti sve
         if (BuildConfig.DEBUG) {
             return message
         }
 
-        // Release build uvijek sanitizira
         return message
             .replace(
                 Regex(
-                    "\"plaintext\"\\s*:\\s*\".*?\""
-                ),
-                "\"plaintext\":\"***\""
-            )
-            .replace(
-                Regex(
-                    "\"ciphertext\"\\s*:\\s*\".*?\""
-                ),
-                "\"ciphertext\":\"***\""
-            )
+                    "(?i)\"(plaintext|ciphertext|content|sig|signature|event|signing_?payload|private_?key|secret|seed|mnemonic|password|token|jwt|cookie|authorization)\"\\s*:\\s*\"(?:\\\\.|[^\"])*\""
+                )
+            ) { match ->
+                val key = match.groupValues[1]
+                "\"$key\":\"***\""
+            }
             .replace(
                 Regex(
-                    "\"sig\"\\s*:\\s*\".*?\""
-                ),
-                "\"sig\":\"***\""
-            )
+                    "(?i)\"(event|signing_?payload)\"\\s*:\\s*(\\{[^\\r\\n]*}|\\[[^\\r\\n]*])"
+                )
+            ) { match ->
+                val key = match.groupValues[1]
+                "\"$key\":\"***\""
+            }
             .replace(
                 Regex(
-                    "\"event\"\\s*:\\s*\".*?\""
-                ),
-                "\"event\":\"***\""
-            )
+                    "(?i)(authorization|proxy-authorization|cookie|set-cookie)\\s*:\\s*[^\\r\\n]+"
+                )
+            ) { match ->
+                "${match.groupValues[1]}: ***"
+            }
             .replace(
                 Regex(
-                    "(?i)authorization: .*"
+                    "(?i)bearer\\s+[^\\s,;]+"
                 ),
-                "authorization: ***"
+                "Bearer ***"
             )
             .replace(
                 Regex(
-                    "(?i)bearer\\s+[A-Za-z0-9._-]+"
-                ),
-                "Bearer ***"
-            )
+                    "(?i)(token|auth_?token|jwt|password|private_?key|secret|seed|mnemonic|signature|sig|event|signing_?payload|plaintext|ciphertext|cookie)=([^\\s&]+)"
+                )
+            ) { match ->
+                "${match.groupValues[1]}=***"
+            }
             .replace(
                 Regex(
-                    "(?i)token=[^\\s&]+"
+                    "(?i)\\b(nsec1)[023456789acdefghjklmnpqrstuvwxyz]+"
                 ),
-                "token=***"
+                "nsec1***"
             )
             .replace(
                 Regex(
-                    "(?i)password=[^\\s&]+"
+                    "\\beyJ[A-Za-z0-9_-]+\\.[A-Za-z0-9_-]+\\.[A-Za-z0-9_-]+\\b"
                 ),
-                "password=***"
+                "JWT***"
             )
     }
 

package/android-template/app/src/main/java/com/pakstr/app/debug/DebugReportExporter.kt

@@ -106,7 +106,7 @@ object DebugReportExporter {
         ${RuntimeConfig.apiEnabled(context)}
 
         WebView Debug:
-        ${BuildConfig.DEBUG || RuntimeConfig.debugEnabled(context)}
+        ${WebViewDebugManager.isInspectionAllowed(context)}
 
         Logs:
         -------------------
@@ -120,30 +120,6 @@ object DebugReportExporter {
         text: String
     ): String {
 
-        return text
-            .replace(
-                Regex("(?i)authorization:\\s*.*"),
-                "authorization: ***"
-            )
-            .replace(
-                Regex("(?i)bearer\\s+[a-zA-Z0-9._-]+"),
-                "Bearer ***"
-            )
-            .replace(
-                Regex("(?i)token=.*"),
-                "token=***"
-            )
-            .replace(
-                Regex("(?i)password=.*"),
-                "password=***"
-            )
-            .replace(
-                Regex("(?i)private.?key=.*"),
-                "privateKey=***"
-            )
-            .replace(
-                Regex("(?i)nsec[a-zA-Z0-9]+"),
-                "nsec***"
-            )
+        return AppDebugLogger.sanitize(text)
     }
 }

package/android-template/app/src/main/java/com/pakstr/app/debug/DeveloperToolsAccessManager.kt

@@ -2,13 +2,10 @@ package com.pakstr.app.debug
 
 import android.content.Context
 import com.pakstr.app.BuildConfig
-import com.pakstr.app.RuntimeConfig
-
 object DeveloperToolsAccessManager {
 
     fun canOpenDeveloperTools(context: Context): Boolean {
         return BuildConfig.DEBUG ||
-                RuntimeConfig.debugEnabled(context) ||
                 SupportUnlock.isActive(context)
     }
 }

package/android-template/app/src/main/java/com/pakstr/app/debug/DeveloperToolsActivity.kt

@@ -43,6 +43,12 @@ class DeveloperToolsActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         enableEdgeToEdge()
         super.onCreate(savedInstanceState)
+
+        if (!DeveloperToolsAccessManager.canOpenDeveloperTools(this)) {
+            finish()
+            return
+        }
+
         setContentView(R.layout.activity_developer_tools)
 
         setupToolbar()
@@ -123,7 +129,7 @@ class DeveloperToolsActivity : AppCompatActivity() {
     }
 
     private fun isWebViewDebugEnabled(): Boolean {
-        return BuildConfig.DEBUG || RuntimeConfig.debugEnabled(this)
+        return WebViewDebugManager.isInspectionAllowed(this)
     }
 
     private fun setupLogActions() {

package/android-template/app/src/main/java/com/pakstr/app/debug/DeviceDeveloperState.kt

@@ -0,0 +1,23 @@
+package com.pakstr.app.debug
+
+import android.content.Context
+import android.provider.Settings
+
+object DeviceDeveloperState {
+
+    fun isAdbEnabled(context: Context): Boolean {
+        return isAdbEnabled {
+            Settings.Global.getInt(
+                context.contentResolver,
+                Settings.Global.ADB_ENABLED,
+                0
+            )
+        }
+    }
+
+    internal fun isAdbEnabled(
+        readSetting: () -> Int
+    ): Boolean {
+        return readSetting() == 1
+    }
+}

package/android-template/app/src/main/java/com/pakstr/app/debug/WebViewDebugManager.kt

@@ -1,30 +1,52 @@
 package com.pakstr.app.debug
 
-import android.R.attr.enabled
 import android.content.Context
 import android.webkit.WebView
 import com.pakstr.app.BuildConfig
-import com.pakstr.app.RuntimeConfig
 
 object WebViewDebugManager {
 
+    internal var debuggingStateApplier: (Boolean) -> Unit =
+        WebView::setWebContentsDebuggingEnabled
+
+
+    fun isInspectionAllowed(
+        context: Context
+    ): Boolean {
+        return isInspectionAllowed(
+            isDebugBuild = BuildConfig.DEBUG,
+            isSupportUnlocked = SupportUnlock.isActive(context),
+            isAdbEnabled = DeviceDeveloperState.isAdbEnabled(context)
+        )
+    }
+
+    internal fun isInspectionAllowed(
+        isDebugBuild: Boolean,
+        isSupportUnlocked: Boolean,
+        isAdbEnabled: Boolean
+    ): Boolean {
+        return isDebugBuild ||
+                (isSupportUnlocked && isAdbEnabled)
+    }
 
     fun enable(
         context: Context
     ) {
 
-        WebView.setWebContentsDebuggingEnabled(
-            BuildConfig.DEBUG ||
-                    RuntimeConfig.debugEnabled(context)
-        )
-        AppDebugLogger.log(
+        val enabled = isInspectionAllowed(context)
 
-            context,
+        setWebContentsDebuggingEnabled(enabled)
 
+        AppDebugLogger.log(
+            context,
             "WEBVIEW",
-
             "WebView debugging enabled: $enabled"
-
         )
     }
-}
+
+    internal fun setWebContentsDebuggingEnabled(
+        enabled: Boolean
+    ) {
+        debuggingStateApplier(enabled)
+    }
+}

package/android-template/app/src/main/java/com/pakstr/app/debug/logging/PakstrLogger.kt

@@ -1,6 +1,7 @@
 package com.pakstr.app.debug.logging
 
 import android.util.Log
+import com.pakstr.app.BuildConfig
 import com.pakstr.app.debug.logging.PakstrLog
 import java.text.SimpleDateFormat
 import java.util.Date
@@ -18,6 +19,8 @@ object PakstrLogger {
         tag: String,
         message: String
     ) {
+        if (!BuildConfig.DEBUG) return
+
         add(
             PakstrLog.Level.DEBUG,
             tag,
@@ -35,6 +38,8 @@ object PakstrLogger {
         tag: String,
         message: String
     ) {
+        if (!BuildConfig.DEBUG) return
+
         add(
             PakstrLog.Level.INFO,
             tag,
@@ -52,6 +57,8 @@ object PakstrLogger {
         tag: String,
         message: String
     ) {
+        if (!BuildConfig.DEBUG) return
+
         add(
             PakstrLog.Level.WARN,
             tag,
@@ -70,6 +77,7 @@ object PakstrLogger {
         message: String,
         throwable: Throwable? = null
     ) {
+        if (!BuildConfig.DEBUG) return
 
         add(
             PakstrLog.Level.ERROR,

package/android-template/app/src/test/java/com/pakstr/app/debug/DeviceDeveloperStateTest.kt

@@ -0,0 +1,21 @@
+package com.pakstr.app.debug
+
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+class DeviceDeveloperStateTest {
+
+    @Test
+    fun adb_is_enabled_only_for_setting_value_one() {
+        assertTrue(
+            DeviceDeveloperState.isAdbEnabled { 1 }
+        )
+        assertFalse(
+            DeviceDeveloperState.isAdbEnabled { 0 }
+        )
+        assertFalse(
+            DeviceDeveloperState.isAdbEnabled { 2 }
+        )
+    }
+}

package/android-template/app/src/test/java/com/pakstr/app/debug/WebViewDebugManagerTest.kt

@@ -0,0 +1,84 @@
+package com.pakstr.app.debug
+
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+class WebViewDebugManagerTest {
+
+    @Test
+    fun debug_build_allows_inspection_without_release_prerequisites() {
+        assertTrue(
+            WebViewDebugManager.isInspectionAllowed(
+                isDebugBuild = true,
+                isSupportUnlocked = false,
+                isAdbEnabled = false
+            )
+        )
+    }
+
+    @Test
+    fun release_allows_inspection_with_support_unlock_and_adb() {
+        assertTrue(
+            WebViewDebugManager.isInspectionAllowed(
+                isDebugBuild = false,
+                isSupportUnlocked = true,
+                isAdbEnabled = true
+            )
+        )
+    }
+
+    @Test
+    fun release_rejects_support_unlock_without_adb() {
+        assertFalse(
+            WebViewDebugManager.isInspectionAllowed(
+                isDebugBuild = false,
+                isSupportUnlocked = true,
+                isAdbEnabled = false
+            )
+        )
+    }
+
+    @Test
+    fun release_rejects_adb_without_support_unlock() {
+        assertFalse(
+            WebViewDebugManager.isInspectionAllowed(
+                isDebugBuild = false,
+                isSupportUnlocked = false,
+                isAdbEnabled = true
+            )
+        )
+    }
+
+    @Test
+    fun release_rejects_inspection_without_either_prerequisite() {
+        assertFalse(
+            WebViewDebugManager.isInspectionAllowed(
+                isDebugBuild = false,
+                isSupportUnlocked = false,
+                isAdbEnabled = false
+            )
+        )
+    }
+
+    @Test
+    fun allowed_release_state_is_applied_to_webview_debugging() {
+        val appliedStates = mutableListOf<Boolean>()
+        val previous = WebViewDebugManager.debuggingStateApplier
+        WebViewDebugManager.debuggingStateApplier = appliedStates::add
+
+        try {
+            val allowed =
+                WebViewDebugManager.isInspectionAllowed(
+                    isDebugBuild = false,
+                    isSupportUnlocked = true,
+                    isAdbEnabled = true
+                )
+            WebViewDebugManager.setWebContentsDebuggingEnabled(allowed)
+        } finally {
+            WebViewDebugManager.debuggingStateApplier = previous
+        }
+
+        assertTrue(appliedStates.single())
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pakstr",
-  "version": "0.8.5",
+  "version": "0.8.7",
   "description": "CLI for packaging Nostr web apps into Android APKs",
   "type": "commonjs",
   "main": "dist/index.js",