pakstr 0.28.0 → 0.29.1

package/android-template/app/src/main/java/com/pakstr/app/signer/local/LocalAccountImportCandidate.kt

@@ -0,0 +1,42 @@
+package com.pakstr.app.signer.local
+
+import com.pakstr.app.crypto.Nip19Codec
+import com.pakstr.app.crypto.Nip46ClientKey
+
+internal class LocalAccountImportCandidate private constructor(
+    private val key: Nip46ClientKey,
+    val npub: String
+) : AutoCloseable {
+
+    internal fun <T> withPrivateKey(
+        block: (ByteArray) -> T
+    ): T = key.withPrivateKey(block)
+
+    override fun close() {
+        key.close()
+    }
+
+    companion object {
+        fun parse(nsec: String): LocalAccountImportCandidate {
+            val privateKey = Nip19Codec.decodeNsec(nsec)
+            return try {
+                val key = Nip46ClientKey.fromPrivateKey(privateKey)
+                try {
+                    val publicKey = key.publicKey
+                    val npub =
+                        try {
+                            Nip19Codec.encodeNpub(publicKey)
+                        } finally {
+                            publicKey.fill(0)
+                        }
+                    LocalAccountImportCandidate(key, npub)
+                } catch (error: Exception) {
+                    key.close()
+                    throw error
+                }
+            } finally {
+                privateKey.fill(0)
+            }
+        }
+    }
+}

package/android-template/app/src/main/java/com/pakstr/app/signer/local/LocalAccountStore.kt

@@ -16,6 +16,9 @@ internal class LocalAccountStorageException(
     cause: Throwable? = null
 ) : Exception(message, cause)
 
+internal class LocalAccountAlreadyExistsException :
+    IllegalStateException("Local account already exists")
+
 internal class LocalAccountStore(
     context: Context,
     private val preferencesName: String = PREFERENCES_NAME,
@@ -47,6 +50,18 @@ internal class LocalAccountStore(
             }
         }
 
+    fun importAccount(privateKey: ByteArray): String =
+        synchronized(STORAGE_LOCK) {
+            if (hasAccountLocked()) {
+                throw LocalAccountAlreadyExistsException()
+            }
+
+            Nip46ClientKey.fromPrivateKey(privateKey).use { key ->
+                key.withPrivateKey(::saveNewKey)
+                key.publicKeyHex
+            }
+        }
+
     fun hasAccount(): Boolean =
         synchronized(STORAGE_LOCK) {
             hasAccountLocked()
@@ -105,8 +120,8 @@ internal class LocalAccountStore(
     }
 
     private fun saveNewKey(privateKey: ByteArray) {
-        check(!hasAccountLocked()) {
-            "Local account already exists"
+        if (hasAccountLocked()) {
+            throw LocalAccountAlreadyExistsException()
         }
 
         val wrappingKey = getOrCreateWrappingKey()

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

@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.WindowManager
 import android.widget.Button
 import android.widget.RadioGroup
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
@@ -14,9 +15,11 @@ import com.pakstr.app.R
 
 class SignerPickerBottomSheet(
     private val hasBunkerSession: Boolean,
+    private val hasLocalAccount: Boolean,
     private val onAmberSelected: () -> Unit,
     private val onBunkerSelected: (String) -> Boolean,
     private val onLocalSelected: () -> Unit,
+    private val onLocalImportSelected: (String) -> Boolean,
     private val onSharePairing: (List<String>) -> Unit,
     private val onBunkerLogout: () -> Unit,
     private val onDismissed: () -> Unit = {}
@@ -34,6 +37,11 @@ class SignerPickerBottomSheet(
         )
     }
 
+    override fun onStart() {
+        super.onStart()
+        dialog?.window?.addFlags(WindowManager.LayoutParams.FLAG_SECURE)
+    }
+
     override fun onViewCreated(
         view: View,
         savedInstanceState: Bundle?
@@ -42,6 +50,11 @@ class SignerPickerBottomSheet(
         val radioGroup = view.findViewById<RadioGroup>(R.id.options_radio_group)
         val uriContainer = view.findViewById<TextInputLayout>(R.id.bunker_uri_container)
         val uriInput = view.findViewById<TextInputEditText>(R.id.bunker_uri)
+        val localActions = view.findViewById<View>(R.id.local_account_actions)
+        val localExisting = view.findViewById<View>(R.id.local_account_existing)
+        val localActionGroup = view.findViewById<RadioGroup>(R.id.local_action_radio_group)
+        val nsecContainer = view.findViewById<TextInputLayout>(R.id.local_nsec_container)
+        val nsecInput = view.findViewById<TextInputEditText>(R.id.local_nsec)
         val confirm = view.findViewById<Button>(R.id.button_confirm)
         val sharePairing = view.findViewById<Button>(R.id.button_share_pairing)
         val logout = view.findViewById<Button>(R.id.button_logout_bunker)
@@ -49,19 +62,58 @@ class SignerPickerBottomSheet(
         logout.visibility =
             if (hasBunkerSession) View.VISIBLE else View.GONE
 
-        fun updateBunkerControls() {
+        fun updateControls() {
             val bunkerSelected =
                 radioGroup.checkedRadioButtonId == R.id.radio_option_two
+            val localSelected =
+                radioGroup.checkedRadioButtonId == R.id.radio_option_three
             uriContainer.visibility =
                 if (bunkerSelected) View.VISIBLE else View.GONE
             sharePairing.visibility =
                 if (bunkerSelected) View.VISIBLE else View.GONE
+            localActions.visibility =
+                if (localSelected && !hasLocalAccount) {
+                    View.VISIBLE
+                } else {
+                    View.GONE
+                }
+            localExisting.visibility =
+                if (localSelected && hasLocalAccount) {
+                    View.VISIBLE
+                } else {
+                    View.GONE
+                }
+            nsecContainer.visibility =
+                if (
+                    localSelected &&
+                    !hasLocalAccount &&
+                    localActionGroup.checkedRadioButtonId ==
+                    R.id.radio_local_import
+                ) {
+                    View.VISIBLE
+                } else {
+                    View.GONE
+                }
         }
         radioGroup.setOnCheckedChangeListener { _, _ ->
             uriContainer.error = null
-            updateBunkerControls()
+            nsecContainer.error = null
+            if (radioGroup.checkedRadioButtonId != R.id.radio_option_three) {
+                nsecInput.text?.clear()
+            }
+            updateControls()
         }
-        updateBunkerControls()
+        localActionGroup.setOnCheckedChangeListener { _, _ ->
+            nsecContainer.error = null
+            if (
+                localActionGroup.checkedRadioButtonId !=
+                R.id.radio_local_import
+            ) {
+                nsecInput.text?.clear()
+            }
+            updateControls()
+        }
+        updateControls()
 
         confirm.setOnClickListener {
             when (radioGroup.checkedRadioButtonId) {
@@ -73,7 +125,24 @@ class SignerPickerBottomSheet(
                         return@setOnClickListener
                     }
                 }
-                R.id.radio_option_three -> onLocalSelected()
+                R.id.radio_option_three -> {
+                    val importing =
+                        !hasLocalAccount &&
+                                localActionGroup.checkedRadioButtonId ==
+                                R.id.radio_local_import
+                    if (importing) {
+                        val value =
+                            nsecInput.text?.toString().orEmpty().trim()
+                        if (!onLocalImportSelected(value)) {
+                            nsecContainer.error =
+                                getString(R.string.signer_picker_local_invalid)
+                            return@setOnClickListener
+                        }
+                        nsecInput.text?.clear()
+                    } else {
+                        onLocalSelected()
+                    }
+                }
                 else -> onAmberSelected()
             }
             dismiss()
@@ -104,6 +173,13 @@ class SignerPickerBottomSheet(
         }
     }
 
+    override fun onDestroyView() {
+        view?.findViewById<TextInputEditText>(R.id.local_nsec)
+            ?.text
+            ?.clear()
+        super.onDestroyView()
+    }
+
     override fun onDismiss(dialog: DialogInterface) {
         super.onDismiss(dialog)
         onDismissed()

package/android-template/app/src/main/res/layout/activity_developer_tools.xml

@@ -208,6 +208,21 @@
                             android:layout_height="wrap_content"
                             android:textColor="?android:attr/textColorSecondary" />
                     </LinearLayout>
+
+                    <TextView
+                        style="@style/TextAppearance.MaterialComponents.Subtitle2"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="12dp"
+                        android:text="@string/developer_tools_chrome_webview_inspection" />
+
+                    <TextView
+                        style="@style/TextAppearance.MaterialComponents.Caption"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="4dp"
+                        android:text="@string/developer_tools_chrome_webview_inspection_note"
+                        android:textColor="?android:attr/textColorSecondary" />
                 </LinearLayout>
             </com.google.android.material.card.MaterialCardView>
 

package/android-template/app/src/main/res/layout/dialog_picker.xml

@@ -97,6 +97,68 @@
             android:textSize="16sp" />
     </RadioGroup>
 
+    <LinearLayout
+        android:id="@+id/local_account_actions"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="12dp"
+        android:orientation="vertical"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:visibility="gone">
+
+        <RadioGroup
+            android:id="@+id/local_action_radio_group"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <RadioButton
+                android:id="@+id/radio_local_create"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:checked="true"
+                android:text="@string/signer_picker_local_create" />
+
+            <RadioButton
+                android:id="@+id/radio_local_import"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/signer_picker_local_import" />
+        </RadioGroup>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/local_nsec_container"
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:hint="@string/signer_picker_local_nsec_hint"
+            android:visibility="gone"
+            app:endIconMode="password_toggle">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/local_nsec"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:importantForAutofill="no"
+                android:inputType="textPassword|textNoSuggestions"
+                android:maxLines="1"
+                android:saveEnabled="false" />
+        </com.google.android.material.textfield.TextInputLayout>
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/local_account_existing"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="12dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:text="@string/signer_picker_local_existing"
+        android:textColor="#4B5563"
+        android:visibility="gone" />
+
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/bunker_uri_container"
         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"

package/android-template/app/src/main/res/values/strings.xml

@@ -32,6 +32,8 @@
     <string name="developer_tools_api_base_save_failed">Unable to persist the API Base URL setting.</string>
     <string name="developer_tools_api_base_invalid">Enter an absolute HTTPS URL without credentials, query, or fragment.</string>
     <string name="developer_tools_webview_debug">WebView Debug</string>
+    <string name="developer_tools_chrome_webview_inspection">Chrome WebView Inspection</string>
+    <string name="developer_tools_chrome_webview_inspection_note">To inspect this app in Chrome DevTools, enable Developer options → USB debugging on your Android device. This is required even when connecting over Wi-Fi.</string>
     <string name="developer_tools_enabled">Enabled</string>
     <string name="developer_tools_disabled">Disabled</string>
 
@@ -66,11 +68,22 @@
 
     <string name="signer_settings">Signer settings</string>
     <string name="signer_picker_title">Choose a signer</string>
-    <string name="signer_picker_subtitle">Use Amber, connect to a remote signer, or create an app-local account.</string>
+    <string name="signer_picker_subtitle">Use Amber, connect to a remote signer, or use an app-local account.</string>
     <string name="signer_picker_amber">Continue with Amber</string>
     <string name="signer_picker_bunker">Connect to remote signer (Bunker)</string>
-    <string name="signer_picker_local">Create app-local account</string>
+    <string name="signer_picker_local">App-local account</string>
+    <string name="signer_picker_local_create">Create new account</string>
+    <string name="signer_picker_local_import">Import existing account</string>
+    <string name="signer_picker_local_nsec_hint">Enter your nsec</string>
+    <string name="signer_picker_local_existing">Use the existing app-local account on this device.</string>
+    <string name="signer_picker_local_invalid">Enter a valid lowercase nsec.</string>
+    <string name="signer_picker_local_confirm_title">Confirm account import</string>
+    <string name="signer_picker_local_confirm_message">Import this account?\n\n%1$s</string>
+    <string name="signer_picker_local_confirm">Import</string>
+    <string name="signer_picker_local_cancel">Cancel</string>
     <string name="signer_picker_local_failed">Unable to create the app-local account.</string>
+    <string name="signer_picker_local_status_failed">Unable to check the app-local account.</string>
+    <string name="signer_picker_local_import_failed">Unable to import the app-local account.</string>
     <string name="signer_picker_bunker_hint">Paste a bunker:// connection</string>
     <string name="signer_picker_share_pairing">Share a nostrconnect:// pairing</string>
     <string name="signer_picker_logout_bunker">Disconnect remote signer</string>

package/android-template/app/src/test/java/com/pakstr/app/crypto/Nip19CodecTest.kt

@@ -0,0 +1,178 @@
+package com.pakstr.app.crypto
+
+import com.pakstr.app.signer.local.LocalAccountImportCandidate
+import org.junit.Assert.assertArrayEquals
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertThrows
+import org.junit.Test
+
+class Nip19CodecTest {
+
+    @Test
+    fun decodes_known_nsec_vector() {
+        val decoded = Nip19Codec.decodeNsec(NSEC_ONE)
+
+        assertArrayEquals(
+            ByteArray(32).also { it[31] = 1 },
+            decoded
+        )
+        decoded.fill(0)
+    }
+
+    @Test
+    fun encodes_known_npub_vector() {
+        val publicKey = Bip340Hash.hexToBytes(PUBLIC_KEY_ONE)
+
+        try {
+            assertEquals(NPUB_ONE, Nip19Codec.encodeNpub(publicKey))
+        } finally {
+            publicKey.fill(0)
+        }
+    }
+
+    @Test
+    fun import_candidate_derives_expected_npub_and_closes_key() {
+        val candidate = LocalAccountImportCandidate.parse(NSEC_ONE)
+
+        assertEquals(NPUB_ONE, candidate.npub)
+        assertFalse(candidate.toString().contains(NSEC_ONE))
+        candidate.close()
+        assertThrows(IllegalStateException::class.java) {
+            candidate.withPrivateKey { }
+        }
+    }
+
+    @Test
+    fun rejects_noncanonical_or_corrupt_nsec() {
+        val invalid = listOf(
+            NSEC_ONE.uppercase(),
+            "Nsec" + NSEC_ONE.substring(4),
+            "xsec" + NSEC_ONE.substring(4),
+            NSEC_ONE.dropLast(1) + "q",
+            NSEC_ONE.replaceRange(8, 9, "i"),
+            NSEC_ONE.dropLast(1),
+            NSEC_ONE + "q"
+        )
+
+        invalid.forEach { value ->
+            assertThrows(InvalidNsecException::class.java) {
+                Nip19Codec.decodeNsec(value)
+            }
+        }
+    }
+
+    @Test
+    fun rejects_invalid_private_scalars() {
+        val zero = encodeNsecForTest(ByteArray(32))
+        val order = Bip340Hash.hexToBytes(SECP256K1_ORDER)
+        val aboveOrder = order.copyOf().also {
+            it[it.lastIndex] = (it.last().toInt() + 1).toByte()
+        }
+
+        try {
+            assertThrows(IllegalArgumentException::class.java) {
+                LocalAccountImportCandidate.parse(zero)
+            }
+            assertThrows(IllegalArgumentException::class.java) {
+                LocalAccountImportCandidate.parse(
+                    encodeNsecForTest(order)
+                )
+            }
+            assertThrows(IllegalArgumentException::class.java) {
+                LocalAccountImportCandidate.parse(
+                    encodeNsecForTest(aboveOrder)
+                )
+            }
+        } finally {
+            order.fill(0)
+            aboveOrder.fill(0)
+        }
+    }
+
+    @Test
+    fun rejects_wrong_payload_lengths_and_accepts_leading_zero() {
+        assertThrows(InvalidNsecException::class.java) {
+            Nip19Codec.decodeNsec(encodeNsecForTest(ByteArray(31)))
+        }
+        assertThrows(InvalidNsecException::class.java) {
+            Nip19Codec.decodeNsec(encodeNsecForTest(ByteArray(33)))
+        }
+
+        LocalAccountImportCandidate.parse(NSEC_ONE).use { candidate ->
+            assertEquals(NPUB_ONE, candidate.npub)
+        }
+    }
+
+    private fun encodeNsecForTest(bytes: ByteArray): String {
+        val data = convertBits(bytes)
+        val values = hrpExpand("nsec") + data + IntArray(6)
+        val checksum = polymod(values) xor 1
+        val check = IntArray(6) { index ->
+            (checksum shr (5 * (5 - index))) and 31
+        }
+        return "nsec1" + (data + check).joinToString("") {
+            CHARSET[it].toString()
+        }
+    }
+
+    private fun convertBits(bytes: ByteArray): IntArray {
+        var accumulator = 0
+        var bits = 0
+        val output = ArrayList<Int>()
+        bytes.forEach { byte ->
+            accumulator = (accumulator shl 8) or (byte.toInt() and 0xff)
+            bits += 8
+            while (bits >= 5) {
+                bits -= 5
+                output += (accumulator shr bits) and 31
+            }
+        }
+        if (bits > 0) {
+            output += (accumulator shl (5 - bits)) and 31
+        }
+        return output.toIntArray()
+    }
+
+    private fun hrpExpand(hrp: String): IntArray =
+        IntArray(hrp.length * 2 + 1).also { result ->
+            hrp.forEachIndexed { index, character ->
+                result[index] = character.code shr 5
+                result[hrp.length + 1 + index] = character.code and 31
+            }
+        }
+
+    private fun polymod(values: IntArray): Int {
+        var checksum = 1
+        val generators = intArrayOf(
+            0x3b6a57b2,
+            0x26508e6d,
+            0x1ea119fa,
+            0x3d4233dd,
+            0x2a1462b3
+        )
+        values.forEach { value ->
+            val top = checksum ushr 25
+            checksum = (checksum and 0x1ffffff) shl 5 xor value
+            generators.forEachIndexed { index, generator ->
+                if ((top shr index) and 1 != 0) {
+                    checksum = checksum xor generator
+                }
+            }
+        }
+        return checksum
+    }
+
+    private companion object {
+        const val CHARSET =
+            "qpzry9x8gf2tvdw0s3jn54khce6mua7l"
+        const val NSEC_ONE =
+            "nsec1qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqsmhltgl"
+        const val PUBLIC_KEY_ONE =
+            "79be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798"
+        const val NPUB_ONE =
+            "npub10xlxvlhemja6c4dqv22uapctqupfhlxm9h8z3k2e72q4k9hcz7vqpkge6d"
+        const val SECP256K1_ORDER =
+            "fffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141"
+    }
+}

package/dist/cli.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runCLI = runCLI;
+const path_1 = __importDefault(require("path"));
 const build_1 = require("./commands/build");
 const sign_1 = require("./commands/sign");
 const publish_1 = require("./commands/publish");
@@ -15,9 +16,14 @@ const deletePublisher_1 = require("./commands/deletePublisher");
 const dotenv_1 = require("./core/dotenv");
 const package_json_1 = __importDefault(require("../package.json"));
 async function runCLI(argv) {
-    // Auto-load a local `.env` (gitignored) so `pakstr run` works out of the box
-    // after `pakstr init`. Existing env vars (e.g. CI secrets) always win.
-    (0, dotenv_1.loadDotEnv)();
+    const command = argv[0];
+    const args = argv.slice(1);
+    const configFlag = extractFlag(args, "--config");
+    // Auto-load the `.env` (gitignored) next to the config file, where
+    // `pakstr init` writes it, so `pakstr run` works out of the box. Without
+    // --config that is the current directory. Existing env vars (e.g. CI
+    // secrets) always win.
+    (0, dotenv_1.loadDotEnv)(configDir(configFlag));
     if (argv.includes("--help") || argv.includes("-h")) {
         printHelp();
         return;
@@ -26,13 +32,10 @@ async function runCLI(argv) {
         console.log(package_json_1.default.version);
         return;
     }
-    const command = argv[0];
-    const args = argv.slice(1);
     if (!command) {
         printHelp();
         return;
     }
-    const configFlag = extractFlag(args, "--config");
     switch (command) {
         case "init":
             await (0, init_1.initCommand)({ force: args.includes("--force"), out: configFlag });
@@ -99,6 +102,10 @@ function extractFlag(args, flag) {
         return undefined;
     return args[i + 1];
 }
+/** Directory of the config file, resolved the same way as loadPakstrConfig. */
+function configDir(configFlag) {
+    return configFlag ? path_1.default.dirname(path_1.default.resolve(configFlag)) : process.cwd();
+}
 function printHelp() {
     console.log(`
 Pakstr — one-step nsec -> build -> sign -> publish.