Merge pull request #776 from openziti/fix-ziti-error-parsing

fix ziti_error parsing
openziti · Nov 21, 2024 · 9db50a3 · 9db50a3
2 parents d5a7ac5 + 11d17eb
commit 9db50a3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/inc_internal/internal_model.h b/inc_internal/internal_model.h
@@ -69,7 +69,7 @@ XX(err, model_number, none, , __VA_ARGS__) \
 XX(http_code, model_number, none, , __VA_ARGS__) \
 XX(code, model_string, none, code, __VA_ARGS__) \
 XX(message, model_string, none, message, __VA_ARGS__) \
-XX(cause, model_string, map, cause, __VA_ARGS__)
+XX(cause, json, map, cause, __VA_ARGS__)
 
 #define ZITI_ENROLLMENT_JWT_HEADER_MODEL(XX, ...) \
 XX(alg, jwt_sig_method, none, alg, __VA_ARGS__) \

diff --git a/library/ziti_ctrl.c b/library/ziti_ctrl.c
@@ -432,7 +432,16 @@ static void ctrl_body_cb(tlsuv_http_req_t *req, char *b, ssize_t len) {
             string_buf_free(resp->content_proc);
             FREE(resp->content_proc);
         } else {
-            ziti_error_ptr_from_json(&error, json_object_object_get(resp->content, "error"));
+            json_object *err_json = json_object_object_get(resp->content, "error");
+            if (err_json) {
+                error = alloc_ziti_error();
+                if (ziti_error_from_json(error, err_json) != 0) {
+                    ZITI_LOG(ERROR, "failed to parse ziti_error: %s", json_object_get_string(err_json));
+                    error->err = ZITI_WTF;
+                    error->code = strdup("UNEXPECTED_ERROR");
+                    error->message = strdup(json_object_get_string(err_json));
+                }
+            }
             resp_meta meta = {0};
             resp_meta_from_json(&meta, json_object_object_get(resp->content, "meta"));
             json_object *data = json_object_object_get(resp->content, "data");