Merge pull request #14 from aafanasev/feature/mask-nulls

Add an option to not mask null values
aafanasev · Jun 21, 2020 · 0d89695 · 0d89695
2 parents 2d29db5 + 60bc8ef
commit 0d89695
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -53,14 +53,17 @@ dependencies {
 
 // OR use your own
 sekret {
+    // "■■■" by default
+    mask = "***"    
+    
     // true by default
     enabled = true  
     
-    // "dev.afanasev.sekret.Secret" by default
-    annotations = ["com.sample.YourAnnotation"]
+    // true by default
+    maskNulls = false  
     
-    // "■■■" by default
-    mask = "***" 
+    // "dev.afanasev.sekret.Secret" by default
+    annotations = ["com.sample.YourAnnotation"] 
 }
 ```
 

diff --git a/gradle-plugin/build.gradle.kts b/gradle-plugin/build.gradle.kts
@@ -2,7 +2,7 @@ plugins {
     kotlin("jvm")
     kotlin("kapt")
     `java-gradle-plugin`
-    id("com.gradle.plugin-publish") version "0.10.0"
+    id("com.gradle.plugin-publish") version "0.11.0"
 }
 
 dependencies {

diff --git a/kotlin-plugin/src/main/kotlin/dev/afanasev/sekret/kotlin/SekretClassBuilder.kt b/kotlin-plugin/src/main/kotlin/dev/afanasev/sekret/kotlin/SekretClassBuilder.kt
@@ -6,6 +6,7 @@ import org.jetbrains.kotlin.descriptors.PropertyDescriptor
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin
 import org.jetbrains.org.objectweb.asm.FieldVisitor
+import org.jetbrains.org.objectweb.asm.Label
 import org.jetbrains.org.objectweb.asm.MethodVisitor
 import org.jetbrains.org.objectweb.asm.Opcodes
 import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter
@@ -56,14 +57,34 @@ class SekretClassBuilder(
         return object : MethodVisitor(Opcodes.ASM5, original) {
 
             private var replaceDescriptor: Boolean = false
+            private var appendLabel: Label? = null
 
             override fun visitFieldInsn(opcode: Int, owner: String?, name: String?, descriptor: String?) {
                 if (opcode == Opcodes.GETFIELD && secretFields.contains(name)) {
                     replaceDescriptor = true
 
-                    InstructionAdapter(this).apply {
-                        pop()
-                        visitLdcInsn(mask)
+                    if (maskNulls) {
+                        InstructionAdapter(this).apply {
+                            pop()
+                            visitLdcInsn(mask)
+                        }
+                    } else {
+                        super.visitFieldInsn(opcode, owner, name, descriptor)
+
+                        appendLabel = Label()
+                        val ifNullLabel = Label()
+
+                        InstructionAdapter(this).apply {
+                            ifnull(ifNullLabel)
+
+                            visitLabel(Label())
+                            visitLdcInsn(mask)
+                            goTo(appendLabel)
+
+                            visitLabel(ifNullLabel)
+                            visitLdcInsn("null")
+                            goTo(appendLabel)
+                        }
                     }
                 } else {
                     super.visitFieldInsn(opcode, owner, name, descriptor)
@@ -79,6 +100,11 @@ class SekretClassBuilder(
                 ) {
                     replaceDescriptor = false
 
+                    appendLabel?.let {
+                        visitLabel(appendLabel)
+                        appendLabel = null
+                    }
+
                     APPEND_DESCRIPTOR
                 } else {
                     descriptor