fix: Check for empty script in pay-to-pubkey-hash transactions.

Signed-off-by: Markus Sabadello <markus@danubetech.com>
WebOfTrustInfo · May 11, 2020 · 0dbcc81 · 0dbcc81
1 parent b9c80a8
commit 0dbcc81
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/src/main/java/info/weboftrust/btctxlookup/bitcoinconnection/BTCDRPCBitcoinConnection.java b/src/main/java/info/weboftrust/btctxlookup/bitcoinconnection/BTCDRPCBitcoinConnection.java
@@ -225,7 +225,7 @@ public DidBtcrData getDidBtcrData(ChainAndTxid chainAndTxid) throws IOException
 			if (scriptSig == null) continue;
 
 			String asm = (String) scriptSig.get("asm");
-			if (asm == null) continue;
+			if (asm == null || asm.trim().isEmpty()) continue;
 
 			Matcher matcher = patternAsmInputScriptPubKey.matcher(asm);
 

diff --git a/...main/java/info/weboftrust/btctxlookup/bitcoinconnection/BitcoindRPCBitcoinConnection.java b/...main/java/info/weboftrust/btctxlookup/bitcoinconnection/BitcoindRPCBitcoinConnection.java
@@ -6,6 +6,7 @@
 import java.net.URI;
 import java.net.URL;
 import java.util.List;
+import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -117,7 +118,12 @@ public DidBtcrData getDidBtcrData(ChainAndTxid chainAndTxid) {
 
 			if (in.scriptSig() != null && in.scriptSig().get("asm") != null) {
 
-				Matcher matcher = patternAsmInputScriptPubKey.matcher((String) in.scriptSig().get("asm"));
+				Map<String, Object> scriptSig = in.scriptSig();
+
+				String asm = (String) scriptSig.get("asm");
+				if (asm == null || asm.trim().isEmpty()) continue;
+
+				Matcher matcher = patternAsmInputScriptPubKey.matcher(asm);
 
 				if (log.isDebugEnabled()) log.debug("IN: " + in.scriptSig().get("asm") + " (MATCHES: " + matcher.matches() + ")");
 

diff --git a/...n/java/info/weboftrust/btctxlookup/bitcoinconnection/BlockcypherAPIBitcoinConnection.java b/...n/java/info/weboftrust/btctxlookup/bitcoinconnection/BlockcypherAPIBitcoinConnection.java
@@ -97,13 +97,14 @@ public DidBtcrData getDidBtcrData(ChainAndTxid chainAndTxid) throws IOException
 		for (Iterator<JsonElement> i = ((JsonArray) txData.get("inputs")).iterator(); i.hasNext(); ) {
 
 			JsonObject input = i.next().getAsJsonObject();
-			JsonElement script = input.get("script");
 			JsonElement scriptType = input.get("script_type");
-			if (script == null || ! script.isJsonPrimitive()) continue;
 			if (scriptType == null || ! scriptType.isJsonPrimitive()) continue;
 
 			if ("pay-to-pubkey-hash".equals(scriptType.getAsString())) {
 
+				JsonElement script = input.get("script");
+				if (script == null || ! script.isJsonPrimitive()) continue;
+
 				Script payToPubKeyHashScript;
 
 				try {
@@ -116,6 +117,9 @@ public DidBtcrData getDidBtcrData(ChainAndTxid chainAndTxid) throws IOException
 
 				inputScriptPubKey = Hex.encodeHexString(payToPubKeyHashScript.getChunks().get(1).data);
 				break;
+			} else {
+
+				throw new IOException("Script type " + scriptType.getAsString() + " not supported.");
 			}
 		}