Fixed exporting issue for base64 encoded content, charles did not like url encoding

Show http status line when we have it, show default when we do not
Version bumped plugin to 0.0.18

Author: NicolaVerbeeck

niddler-plugin/build.gradle

@@ -19,7 +19,7 @@ plugins {
 apply plugin: 'kotlin'
 
 group 'com.icapps'
-version '0.0.17'
+version '0.0.18'
 sourceCompatibility = 1.8
 
 intellij {

niddler-plugin/src/main/resources/META-INF/plugin.xml

@@ -1,12 +1,13 @@
 <idea-plugin version="2">
     <id>com.icapps.niddler</id>
     <name>Niddler</name>
-    <version>0.0.16</version>
+    <version>0.0.18</version>
     <vendor email="support@icapps.com" url="https://www.icapps.com">iCapps</vendor>
 
     <description>This plugin enables the niddler ui inside the IDE</description>
 
     <change-notes>
+        0.0.18 - Fixed HAR export of base64, charles did not like url encoding. Show status line with code when we have it
         0.0.17 - Fixed HAR exports using wrong url
         0.0.16 - Fixed exception when the server uses a different format. Support for exporting to HAR 1.2
         0.0.15 - Better handle empty bodies (from network requests/replies)

niddler-ui/build.gradle

@@ -2,7 +2,7 @@ group 'com.icapps'
 version '0.0.1'
 
 buildscript {
-    ext.kotlin_version = '1.1.51'
+    ext.kotlin_version = '1.1.60'
 
     repositories {
         jcenter()

niddler-ui/src/main/kotlin/com/icapps/niddler/ui/export/HarExport.kt

@@ -105,9 +105,9 @@ class HarExport(private val targetFile: File) {
             BodyFormatType.FORMAT_JSON -> builder.withMime(BodyFormatType.FORMAT_JSON.verbose).withText(message.message.getBodyAsString(message.bodyFormat.encoding))
             BodyFormatType.FORMAT_XML -> builder.withMime(BodyFormatType.FORMAT_XML.verbose).withText(message.message.getBodyAsString(message.bodyFormat.encoding))
             BodyFormatType.FORMAT_PLAIN -> builder.withMime(BodyFormatType.FORMAT_PLAIN.verbose).withText(message.message.getBodyAsString(message.bodyFormat.encoding))
-            BodyFormatType.FORMAT_IMAGE -> builder.withMime(message.bodyFormat.subtype ?: "").withText(message.message.body).withEncoding("base64")
-            BodyFormatType.FORMAT_BINARY -> builder.withMime(message.bodyFormat.subtype ?: "").withText(message.message.body).withEncoding("base64")
-            BodyFormatType.FORMAT_HTML -> builder.withMime(message.bodyFormat.subtype ?: "").withText(message.message.body).withEncoding("base64")
+            BodyFormatType.FORMAT_IMAGE -> builder.withMime(message.bodyFormat.subtype ?: "").withText(message.message.bodyAsNormalBase64).withEncoding("base64")
+            BodyFormatType.FORMAT_BINARY -> builder.withMime(message.bodyFormat.subtype ?: "").withText(message.message.bodyAsNormalBase64).withEncoding("base64")
+            BodyFormatType.FORMAT_HTML -> builder.withMime(message.bodyFormat.subtype ?: "").withText(message.message.bodyAsNormalBase64).withEncoding("base64")
             BodyFormatType.FORMAT_EMPTY -> builder.withMime("").withText("")
             else -> builder.withMime("").withText("")
         }

niddler-ui/src/main/kotlin/com/icapps/niddler/ui/model/NiddlerMessage.kt

@@ -35,6 +35,9 @@ open class NiddlerMessage {
     val getBodyAsBytes: ByteArray?
         get() = if (body != null) Base64.getUrlDecoder().decode(body) else null
 
+    val bodyAsNormalBase64: String?
+        get() = if (body != null) Base64.getEncoder().encodeToString(getBodyAsBytes) else null
+
     fun getBodyAsString(encoding: String?): String? {
         return if (body != null)
             String(Base64.getUrlDecoder().decode(body), if (encoding == null) Charsets.UTF_8 else Charset.forName(encoding))

niddler-ui/src/main/kotlin/com/icapps/niddler/ui/model/ui/LinkedMessagesRenderer.kt

@@ -1,5 +1,6 @@
 package com.icapps.niddler.ui.model.ui
 
+import com.icapps.niddler.ui.model.NiddlerMessage
 import com.icapps.niddler.ui.model.ParsedNiddlerMessage
 import com.icapps.niddler.ui.setFixedWidth
 import com.icapps.niddler.ui.util.getStatusCodeString
@@ -84,7 +85,7 @@ class LinkedMessagesRenderer(private val protocolVersion: Int) : TreeCellRendere
         } else if (value is ResponseNode) {
             message = value.message
             icon = downIcon
-            status = formatStatusCode(value.message.statusCode)
+            status = fromStatusLine(value.message.message) ?: formatStatusCode(value.message.statusCode)
             format = value.message.bodyFormat.toString()
 
             if (protocolVersion == 3) {
@@ -128,7 +129,7 @@ class LinkedMessagesRenderer(private val protocolVersion: Int) : TreeCellRendere
         return if (statusCode == null) {
             ""
         } else {
-            String.format("%d %s", statusCode, getStatusCodeString(statusCode))
+            String.format("%d - %s", statusCode, getStatusCodeString(statusCode))
         }
     }
 
@@ -140,4 +141,10 @@ class LinkedMessagesRenderer(private val protocolVersion: Int) : TreeCellRendere
         formatLabel.foreground = color
     }
 
+    private fun fromStatusLine(message: NiddlerMessage): String? {
+        if (message.statusLine.isNullOrBlank())
+            return null
+        return "${message.statusCode} - ${message.statusLine}"
+    }
+
 }

niddler-ui/src/main/kotlin/com/icapps/niddler/ui/model/ui/TimelineMessagesTableModel.kt

@@ -98,7 +98,16 @@ class TimelineMessagesTableModel : TableModel, MessagesModel {
             INDEX_DIRECTION -> if (message.isRequest) upIcon else downIcon
             INDEX_METHOD -> message.method ?: other?.method
             INDEX_URL -> message.url ?: other?.url
-            INDEX_STATUS_CODE -> if (message.statusCode != null) formatStatusCode(message.statusCode) else formatStatusCode(other?.statusCode)
+            INDEX_STATUS_CODE -> {
+                if (!message.message.statusLine.isNullOrBlank())
+                    "${message.statusCode} - ${message.message.statusLine}"
+                else if (!other?.message?.statusLine.isNullOrBlank())
+                    "${other?.message?.statusCode} - ${other?.message?.statusLine}"
+                else if (message.statusCode != null)
+                    formatStatusCode(message.statusCode)
+                else
+                    formatStatusCode(other?.statusCode)
+            }
             INDEX_FORMAT -> message.bodyFormat
             else -> "<NO COLUMN DEF>"
         }
@@ -108,7 +117,7 @@ class TimelineMessagesTableModel : TableModel, MessagesModel {
         return if (statusCode == null) {
             ""
         } else {
-            String.format("%d %s", statusCode, getStatusCodeString(statusCode))
+            String.format("%d - %s", statusCode, getStatusCodeString(statusCode))
         }
     }