Merge pull request 'infendro-patch-1' (#4) from infendro-patch-1 into develop

Reviewed-on: #4

.gitea/workflows/main.yaml

@@ -1,36 +0,0 @@
-on:
-  push:
-    branches:
-      - main
-
-env:
-  GIT__TOKEN: ${{ secrets.TOKEN }}
-
-jobs:
-  publish:
-    runs-on: linux
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/cache/restore@v4
-        with:
-          key: gradle
-          path: |
-            ~/.gradle/caches/
-            ~/.gradle/wrapper/
-            ~/.konan/
-
-      - uses: actions/setup-java@v4
-        with:
-          java-version: '24'
-          distribution: 'temurin'
-
-      - run: ./gradlew publish
-
-      - uses: actions/cache/save@v4
-        with:
-          key: gradle
-          path: |
-            ~/.gradle/caches/
-            ~/.gradle/wrapper/
-            ~/.konan/

.gitea/workflows/publish.yaml

@@ -0,0 +1,47 @@
+on:
+  push:
+    branches: [ main ]
+
+jobs:
+  publish:
+    runs-on: linux
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          java-version: '24'
+          distribution: 'temurin'
+
+      - name: Cache Gradle
+        uses: actions/cache@v4
+        with:
+          key: gradle-${{ hashFiles('**/libs.versions.toml') }}
+          restore-keys: gradle
+          path: |
+            ~/.gradle/caches/
+            ~/.gradle/wrapper/
+
+      - name: Cache Konan
+        uses: actions/cache@v4
+        with:
+          key: konan-${{ hashFiles('**/libs.versions.toml') }}
+          restore-keys: konan
+          path: |
+            ~/.konan/
+
+      - name: Cache Node
+        uses: actions/cache@v4
+        with:
+          key: node-${{ hashFiles('**/libs.versions.toml') }}
+          restore-keys: node
+          path: |
+            ~/.gradle/nodejs
+            ~/.gradle/yarn
+
+      - name: Publish
+        run: ./gradlew publish
+        env:
+          INFENDRO__TOKEN: ${{ secrets.TOKEN }}

.gitea/workflows/test.yaml

@@ -0,0 +1,28 @@
+on:
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  test:
+    runs-on: linux
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          java-version: '24'
+          distribution: 'temurin'
+
+      - name: Cache Gradle
+        uses: actions/cache@v4
+        with:
+          key: gradle-${{ hashFiles('**/libs.versions.toml') }}
+          restore-keys: gradle
+          path: |
+            ~/.gradle/caches/
+            ~/.gradle/wrapper/
+
+      - name: Test
+        run: ./gradlew jvmTest

README.md

@@ -1,16 +1,10 @@
-# Kotlin OTP
+# otp.kt
 
-This library provides various [One-Time Password](https://en.wikipedia.org/wiki/One-time_password)
-implementations in Kotlin Multiplatform.
+`otp.kt` is a Kotlin Multiplatform library that provides common [One-Time Password](https://en.wikipedia.org/wiki/One-time_password) algorithms.
 
-## Features
-
-* [HOTP](https://en.wikipedia.org/wiki/HMAC-based_one-time_password)
-* [TOTP](https://en.wikipedia.org/wiki/Time-based_one-time_password)
-* Multiplatform support
-    * JVM
-    * JavaScript
-    * Native (Linux)
+Supported algorithms:
+- HOTP
+- TOTP
 
 ## Installation
 
@@ -22,34 +16,25 @@ repositories {
 }
 
 dependencies {
-    implementation("com.infendro:otp:1.1.1")
+    implementation("com.infendro:otp:1.3.1")
 }
 ```
 
 ## Usage
 
 ```kotlin
-import com.infendro.hash.SHA1
-import com.infendro.otp.SecretGenerator
-import com.infendro.otp.TOTP
-import kotlin.time.Clock.System.now
-import kotlin.time.Duration.Companion.seconds
-
 fun main() {
-    // create a TOTP instance using SHA1, a length of 6, and a period of 30 seconds
+    // create TOTP instance
     val totp = TOTP(
-        function = SHA1,
+        function = SHA1(),
         length = 6,
         period = 30.seconds,
     )
 
-    // generate a secret using SHA1
-    val secret = SecretGenerator.generate(SHA1)
-
-    // generate an OTP
-    val otp = totp.generate(secret, now())
-
-    // verify an OTP
-    totp.verify(secret, now(), otp)
+    // generate and verify OTP
+    val secret = "...".encodeToByteArray()
+    val time = System.now()
+    val otp = totp.generate(secret, time)
+    totp.verify(secret, time, otp)
 }
 ```

build.gradle.kts

@@ -1,62 +1,43 @@
-group = "com.infendro"
-version = "1.1.1"
+@file:OptIn(ExperimentalWasmDsl::class)
 
-repositories {
-    maven("https://git.infendro.com/api/packages/Infendro/maven")
-    mavenCentral()
-}
+import com.infendro.plugin.infendro
+import com.infendro.plugin.token
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
+
+group = "com.infendro"
+version = "1.3.1"
 
 plugins {
+    alias(libs.plugins.infendro)
     alias(libs.plugins.multiplatform)
     id("maven-publish")
 }
 
 kotlin {
     jvm()
-    js {
-        nodejs()
-    }
     linuxX64()
+    linuxArm64()
+    mingwX64()
+    macosX64()
+    macosArm64()
+    js { nodejs() }
+    wasmJs { nodejs() }
+    wasmWasi { nodejs() }
+
+    repositories {
+        infendro()
+        mavenCentral()
+    }
 
     sourceSets {
         commonMain.dependencies {
-            implementation(libs.random)
-            implementation(libs.mac)
+            implementation(libs.bytes)
             implementation(libs.hash)
-            implementation(libs.bytearray)
-        }
-    }
-
-    compilerOptions {
-        freeCompilerArgs.add("-opt-in=kotlin.time.ExperimentalTime")
-    }
-}
-
-publishing {
-    repositories {
-        maven {
-            url = uri("https://git.infendro.com/api/packages/Infendro/maven")
-            authentication.create("header", HttpHeaderAuthentication::class)
-            credentials(HttpHeaderCredentials::class) {
-                val token = secret("git.token") ?: throw GradleException()
-
-                name = "Authorization"
-                value = "token $token"
-            }
+            implementation(libs.mac)
         }
     }
 }
 
-fun secret(
-    key: String,
-): String? {
-    val property = key
-    val environment = key
-        .uppercase()
-        .replace(".", "__")
-
-    val prop = properties[property] as String?
-    val env = System.getenv(environment)
-
-    return prop ?: env
+publishing.repositories {
+    infendro(token)
 }

gradle/libs.versions.toml

@@ -1,15 +1,15 @@
 [versions]
-kotlin = "2.1.20"
-random = "1.0.0"
-mac = "1.1.2"
-hash = "1.2.2"
-bytearray = "1.1.1"
+infendro = "1.1.0"
+kotlin = "2.3.0"
+bytes = "1.4.2"
+hash = "1.7.0"
+mac = "1.5.0"
 
 [plugins]
+infendro = { id = "com.infendro.plugin", version.ref = "infendro" }
 multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 
 [libraries]
-random = { module = "com.infendro:random", version.ref = "random" }
-mac = { module = "com.infendro:mac", version.ref = "mac" }
+bytes = { module = "com.infendro:bytes", version.ref = "bytes" }
 hash = { module = "com.infendro:hash", version.ref = "hash" }
-bytearray = { module = "com.infendro:bytearray", version.ref = "bytearray" }
+mac = { module = "com.infendro:mac", version.ref = "mac" }

settings.gradle.kts

@@ -1 +1,6 @@
 rootProject.name = "otp"
+
+pluginManagement.repositories {
+    maven("https://git.infendro.com/api/packages/Infendro/maven")
+    mavenCentral()
+}

src/commonMain/kotlin/com/infendro/otp/HOTP.kt

@@ -1,57 +1,32 @@
 package com.infendro.otp
 
-import com.infendro.bytearray.toByteArray
-import com.infendro.bytearray.toInt
+import com.infendro.bytes.bytearray.toInt
+import com.infendro.bytes.long.toByteArray
 import com.infendro.hash.HashFunction
-import com.infendro.hash.SHA1
+import com.infendro.hash.sha1.SHA1
 import com.infendro.mac.HMAC
+import com.infendro.otp.util.pow
 import kotlin.experimental.and
-import kotlin.math.pow
 
 class HOTP(
-    val function: HashFunction = SHA1,
+    val function: HashFunction = SHA1(),
     val length: Int = 6,
 ) {
-    fun verify(
-        secret: ByteArray,
-        counter: Long,
-        otp: String,
-    ): Boolean {
+    private val hmac = HMAC(function)
+
+    fun generate(secret: ByteArray, counter: Long): String {
+        require(counter >= 0)
+        return otp(secret, counter)
+    }
+
+    fun verify(secret: ByteArray, counter: Long, otp: String): Boolean {
         return generate(secret, counter) == otp
     }
 
-    fun generate(
-        secret: ByteArray,
-        counter: Long,
-    ): String {
-        if (counter < 0) throw Exception()
-
-        val hash = generateHash(
-            secret,
-            counter.toByteArray()
-        )
-        return otp(hash)
-    }
-
-    private fun generateHash(
-        secret: ByteArray,
-        value: ByteArray,
-    ): ByteArray {
-        return HMAC(function).hash(secret, value)
-    }
-
-    private fun otp(
-        hash: ByteArray,
-    ): String {
+    private fun otp(secret: ByteArray, counter: Long): String {
+        val hash = hmac.hash(secret, counter.toByteArray())
         val offset = (hash.last() and 0xF).toInt()
-
-        var truncatedHash = hash
-            .drop(offset)
-            .take(4)
-            .toInt() and 0x7FFFFFFF
-        truncatedHash %= 10.0.pow(length).toInt()
-
-        return truncatedHash.toString()
-            .padStart(length, '0')
+        val otp = (hash.toInt(offset) and 0x7FFFFFFF) % 10.pow(length)
+        return "$otp".padStart(length, '0')
     }
 }

src/commonMain/kotlin/com/infendro/otp/SecretGenerator.kt

@@ -1,22 +0,0 @@
-package com.infendro.otp
-
-import com.infendro.hash.*
-import com.infendro.random.PRNG
-
-object SecretGenerator {
-    private val random = PRNG.HMAC
-
-    fun generate(
-        algorithm: HashFunction = SHA1,
-    ): ByteArray {
-        val bytes = when (algorithm) {
-            MD5 -> 16
-            SHA1 -> 20
-            SHA224 -> 28
-            SHA256 -> 32
-            SHA384 -> 48
-            SHA512 -> 64
-        }
-        return random.nextBytes(bytes)
-    }
-}

src/commonMain/kotlin/com/infendro/otp/TOTP.kt

@@ -1,39 +1,27 @@
 package com.infendro.otp
 
 import com.infendro.hash.HashFunction
-import com.infendro.hash.SHA1
+import com.infendro.hash.sha1.SHA1
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
 import kotlin.time.Instant
 
 class TOTP(
-    function: HashFunction = SHA1,
-    length: Int = 6,
+    val function: HashFunction = SHA1(),
+    val length: Int = 6,
     val period: Duration = 30.seconds,
 ) {
-    val hotp = HOTP(function, length)
+    private val hotp = HOTP(function, length)
 
-    fun verify(
-        secret: ByteArray,
-        instant: Instant,
-        otp: String,
-    ): Boolean {
+    fun generate(secret: ByteArray, instant: Instant): String {
+        return hotp.generate(secret, counter(instant))
+    }
+
+    fun verify(secret: ByteArray, instant: Instant, otp: String): Boolean {
         return generate(secret, instant) == otp
     }
 
-    fun generate(
-        secret: ByteArray,
-        instant: Instant,
-    ): String {
-        return hotp.generate(
-            secret,
-            counter(instant)
-        )
-    }
-
-    private fun counter(
-        instant: Instant,
-    ): Long {
+    private fun counter(instant: Instant): Long {
         val ms = instant.toEpochMilliseconds()
         val d = period.inWholeMilliseconds
         return ms / d

src/commonMain/kotlin/com/infendro/otp/util/Math.kt

@@ -0,0 +1,6 @@
+package com.infendro.otp.util
+
+import kotlin.math.pow
+
+internal fun Int.pow(x: Int): Int =
+    this.toDouble().pow(x).toInt()