Merge pull request #179 from Zondax/check_principal

Allow bigger args for NanoS

Author: jleni

.github/workflows/sonarcloud.yml

@@ -14,7 +14,7 @@ jobs:
     name: SonarQube analyze
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:latest
+      image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder@sha256:877adc3ff619222aaf03a490d546ea9001f02faa0c6ac7c06c876c99584f9cdb
     env:
       SONAR_SCANNER_VERSION: 4.7.0.2747
       SONAR_SERVER_URL: "https://sonarcloud.io"

app/Makefile.version

@@ -3,4 +3,4 @@ APPVERSION_M=2
 # This is the minor version of this release
 APPVERSION_N=1
 # This is the patch version of this release
-APPVERSION_P=5
+APPVERSION_P=6

app/src/candid/candid_parser.c

@@ -121,7 +121,7 @@ const char *CustomTypeToString(uint64_t t) {
             return "?";
     }
 #else
-    return "?"
+    return "?";
 #endif
 }
 
@@ -202,7 +202,7 @@ parser_error_t readCandidWhichVariant(parser_context_t *ctx, uint64_t *t) {
 parser_error_t readAndCheckRootType(parser_context_t *ctx) {
     int64_t tmpType = -1;
     CHECK_PARSER_ERR(readCandidType(ctx, &tmpType))
-    if (tmpType < 0 || tmpType >= ctx->tx_obj->candid_typetableSize) {
+    if (tmpType < 0 || (uint64_t) tmpType >= ctx->tx_obj->candid_typetableSize) {
         return parser_unexpected_type;
     }
 
@@ -740,7 +740,7 @@ parser_error_t readCandidManageNeuron(parser_tx_t *tx, const uint8_t *input, uin
         CHECK_PARSER_ERR(readCandidWhichVariant(&ctx, &val->neuron_id_or_subaccount.which))
 
         txn.element.implementation = savedElementImplementation;
-        int64_t neuron_id_or_subaccount_hash = 0;
+        uint64_t neuron_id_or_subaccount_hash = 0;
         CHECK_PARSER_ERR(getHash(&txn, val->neuron_id_or_subaccount.which, &neuron_id_or_subaccount_hash))
 
         switch (neuron_id_or_subaccount_hash) {

app/src/parser.c

@@ -99,7 +99,7 @@ parser_error_t parser_parse_combined(parser_context_t *ctx, const uint8_t *data,
     MEMZERO(request_hash, sizeof(request_hash));
     PARSER_ASSERT_OR_ERROR(zxerr_ok == crypto_getDigest(request_hash, call), parser_unexpected_error)
 
-#if defined(TARGET_NANOS) || defined(TARGET_NANOX)
+#if defined(TARGET_NANOS) || defined(TARGET_NANOX) || defined(TARGET_NANOS2)
     MEMZERO(G_io_apdu_buffer, IO_APDU_BUFFER_SIZE);
     PARSER_ASSERT_OR_ERROR(memcmp(request_hash, request_id_stateread, 32) == 0, parser_context_invalid_chars)
     MEMCPY(G_io_apdu_buffer, request_hash, 32);

app/src/parser_impl.c

@@ -167,6 +167,13 @@ const char *parser_getErrorDescription(parser_error_t err) {
     CHECK_CBOR_MAP_ERR(_cbor_value_copy_string(&it, (V_OUTPUT).data, &(V_OUTPUT).len, NULL)); \
 }
 
+#define READ_STRING_PTR_SIZE(MAP, FIELDNAME, V_OUTPUT_PTR, V_OUTPUT_SIZE) {                  \
+    CborValue it;                                                                           \
+    CHECK_CBOR_MAP_ERR(cbor_value_map_find_value(MAP, FIELDNAME, &it));                     \
+    PARSER_ASSERT_OR_ERROR(cbor_value_is_byte_string(&it) || cbor_value_is_text_string(&it), parser_context_mismatch); \
+    CHECK_CBOR_MAP_ERR(get_string_chunk(&it, (const void **)&V_OUTPUT_PTR, &V_OUTPUT_SIZE));\
+}
+
 parser_error_t try_read_nonce(CborValue *content_map, parser_tx_t *v) {
     size_t stringLen = 0;
     CborValue it;
@@ -376,6 +383,19 @@ parser_error_t readPayload(parser_tx_t *v, uint8_t *buffer, size_t bufferLen) {
     return parser_unexpected_type;
 }
 
+static bool isCandidTransaction(parser_tx_t *v) {
+    char *method = v->tx_fields.call.method_name.data;
+    if (strcmp(method, "manage_neuron") == 0) {
+        return true;
+    }
+
+    if (strcmp(method, "update_node_provider") == 0) {
+        return true;
+    }
+
+    return false;
+}
+
 parser_error_t readContent(CborValue *content_map, parser_tx_t *v) {
     CborValue content_it;
     zemu_log_stack("read content");
@@ -410,8 +430,16 @@ parser_error_t readContent(CborValue *content_map, parser_tx_t *v) {
         READ_STRING(content_map, "method_name", fields->method_name)
         READ_INT64(content_map, "ingress_expiry", fields->ingress_expiry)
 
-        READ_STRING(content_map, "arg", fields->method_args)
-        CHECK_PARSER_ERR(readPayload(v, fields->method_args.data, fields->method_args.len))
+        if (isCandidTransaction(v)) {
+            READ_STRING_PTR_SIZE(content_map, "arg", fields->method_args.dataPtr, fields->method_args.len)
+            if (fields->method_args.dataPtr == NULL) {
+                return parser_no_data;
+            }
+            CHECK_PARSER_ERR(readPayload(v, fields->method_args.dataPtr, fields->method_args.len))
+        } else {
+            READ_STRING(content_map, "arg", fields->method_args)
+            CHECK_PARSER_ERR(readPayload(v, fields->method_args.data, fields->method_args.len))
+        }
 
     } else if (strcmp(v->request_type.data, "read_state") == 0) {
         state_read_t *fields = &v->tx_fields.stateRead;

app/src/parser_txdef.h

@@ -38,12 +38,7 @@ extern "C" {
 #define METHOD_MAX_LEN 20
 #define NONCE_MAX_LEN 32
 
-// For NanoS restrict max arg size
-#if defined(TARGET_NANOS)
-    #define ARG_MAX_LEN 1000
-#else
-    #define ARG_MAX_LEN 2000
-#endif
+#define ARG_MAX_LEN 1000
 
 #define PATH_MAX_LEN 40
 #define PATH_MAX_ARRAY 2
@@ -124,6 +119,7 @@ typedef struct {
 
 typedef struct {
     uint8_t data[ARG_MAX_LEN + 1];
+    uint8_t *dataPtr;
     size_t len;
 } method_arg_t;