@openziti/ziti-sdk-nodejs 0.14.2 → 0.16.0

package/.github/workflows/build.yml

@@ -57,6 +57,11 @@ jobs:
         submodules: 'recursive'
         # token: ${{ secrets.ZITI_CI_GH_TOKEN }}
 
+    - name: Setup PkgConfig (Windows)
+      if: matrix.config.target == 'windows'
+      run: |
+        choco install pkgconfiglite
+
     - name: Get crossbuild tools
       if: matrix.config.target == 'linux' && matrix.config.arch != 'x64'
       run: |

package/README.md

@@ -50,7 +50,7 @@ Please star us.
 
 # Associated Article(s)
 For more context on this SDK, you may be interested in this
-[article concerning how to secure NodeJS applications](https://openziti.io/securing-nodejs-applications)
+[article concerning how to secure NodeJS applications](https://blog.openziti.io/securing-nodejs-applications)
 
 
 

package/lib/close.js

@@ -1,5 +1,5 @@
 /*
-Copyright Netfoundry, Inc.
+Copyright NetFoundry Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

package/lib/dial.js

@@ -1,5 +1,5 @@
 /*
-Copyright Netfoundry, Inc.
+Copyright NetFoundry Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

package/lib/express-listener.js

@@ -1,5 +1,5 @@
 /*
-Copyright Netfoundry, Inc.
+Copyright NetFoundry Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

package/lib/express.js

@@ -1,5 +1,5 @@
 /*
-Copyright Netfoundry, Inc.
+Copyright NetFoundry Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

package/lib/httpRequest.js

@@ -1,5 +1,5 @@
 /*
-Copyright Netfoundry, Inc.
+Copyright NetFoundry Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

package/lib/httpRequestData.js

@@ -1,5 +1,5 @@
 /*
-Copyright Netfoundry, Inc.
+Copyright NetFoundry Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

package/lib/httpRequestEnd.js

@@ -1,5 +1,5 @@
 /*
-Copyright Netfoundry, Inc.
+Copyright NetFoundry Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

package/lib/index.js

@@ -1,5 +1,5 @@
 /*
-Copyright Netfoundry, Inc.
+Copyright NetFoundry Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

package/lib/init.js

@@ -1,5 +1,5 @@
 /*
-Copyright Netfoundry, Inc.
+Copyright NetFoundry Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

package/lib/listen.js

@@ -1,5 +1,5 @@
 /*
-Copyright Netfoundry, Inc.
+Copyright NetFoundry Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

package/lib/serviceAvailable.js

@@ -1,5 +1,5 @@
 /*
-Copyright Netfoundry, Inc.
+Copyright NetFoundry Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

package/lib/servicesRefresh.js

@@ -0,0 +1,28 @@
+/*
+Copyright NetFoundry Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+
+/**
+ * servicesRefresh()   
+ * 
+ */
+const servicesRefresh = () => {
+
+  ziti.ziti_services_refresh();
+
+};
+
+exports.servicesRefresh = servicesRefresh;

package/lib/setLogLevel.js

@@ -1,5 +1,5 @@
 /*
-Copyright Netfoundry, Inc.
+Copyright NetFoundry Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

package/lib/write.js

@@ -1,5 +1,5 @@
 /*
-Copyright Netfoundry, Inc.
+Copyright NetFoundry Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

package/lib/ziti-socket.js

@@ -1,5 +1,5 @@
 /*
-Copyright Netfoundry, Inc.
+Copyright NetFoundry Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

package/lib/ziti.js

@@ -1,5 +1,5 @@
 /*
-Copyright Netfoundry, Inc.
+Copyright NetFoundry Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@openziti/ziti-sdk-nodejs",
   "description": "A NodeJS-based SDK for delivering secure applications over a Ziti Network",
-  "version": "0.14.2",
+  "version": "0.16.0",
   "main": "./lib/ziti",
   "scripts": {
     "build": "npm run build:init && npm run build:configure && npm run build:make",

package/src/Ziti_https_request.c

@@ -1,5 +1,5 @@
 /*
-Copyright Netfoundry, Inc.
+Copyright NetFoundry Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

package/src/Ziti_https_request_data.c

@@ -1,5 +1,5 @@
 /*
-Copyright Netfoundry, Inc.
+Copyright NetFoundry Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

package/src/Ziti_https_request_end.c

@@ -1,5 +1,5 @@
 /*
-Copyright Netfoundry, Inc.
+Copyright NetFoundry Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

package/src/stack_traces.c

@@ -1,5 +1,5 @@
 /*
-Copyright Netfoundry, Inc.
+Copyright NetFoundry Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

package/src/utils.c

@@ -1,5 +1,5 @@
 /*
-Copyright Netfoundry, Inc.
+Copyright NetFoundry Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

package/src/utils.h

@@ -1,5 +1,5 @@
 /*
-Copyright Netfoundry, Inc.
+Copyright NetFoundry Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

package/src/ziti-add-on.c

@@ -1,5 +1,5 @@
 /*
-Copyright Netfoundry, Inc.
+Copyright NetFoundry Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -76,6 +76,7 @@ napi_value Init(napi_env env, napi_value exports) {
   expose_ziti_init(env, exports);
   expose_ziti_listen(env, exports);
   expose_ziti_service_available(env, exports);
+  expose_ziti_services_refresh(env, exports);
   expose_ziti_shutdown(env, exports);
   expose_ziti_write(env, exports);
 

package/src/ziti-nodejs.h

@@ -1,5 +1,5 @@
 /*
-Copyright NetFoundry, Inc.
+Copyright NetFoundry Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -207,6 +207,7 @@ extern void expose_ziti_sdk_version(napi_env env, napi_value exports);
 extern void expose_ziti_init(napi_env env, napi_value exports);
 extern void expose_ziti_listen(napi_env env, napi_value exports);
 extern void expose_ziti_service_available(napi_env env, napi_value exports);
+extern void expose_ziti_services_refresh(napi_env env, napi_value exports);
 extern void expose_ziti_set_log_level(napi_env env, napi_value exports);
 extern void expose_ziti_shutdown(napi_env env, napi_value exports);
 extern void expose_ziti_write(napi_env env, napi_value exports);

package/src/ziti_close.c

@@ -1,5 +1,5 @@
 /*
-Copyright Netfoundry, Inc.
+Copyright NetFoundry Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

package/src/ziti_dial.c

@@ -1,5 +1,5 @@
 /*
-Copyright Netfoundry, Inc.
+Copyright NetFoundry Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -328,8 +328,6 @@ napi_value _ziti_dial(napi_env env, const napi_callback_info info) {
     napi_throw_error(env, NULL, "Unable to napi_create_threadsafe_function");
   }
   
-  ziti_set_timeout(ztx, 5*1000);
-
   // Init a Ziti connection object, and attach our add-on data to it so we can 
   // pass context around between our callbacks, as propagate it all the way out
   // to the JavaScript callbacks

package/src/ziti_enroll.c

@@ -1,5 +1,5 @@
 /*
-Copyright Netfoundry, Inc.
+Copyright NetFoundry Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

package/src/ziti_init.c

@@ -1,5 +1,5 @@
 /*
-Copyright Netfoundry, Inc.
+Copyright NetFoundry Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -31,6 +31,12 @@ static const char *ALL_CONFIG_TYPES[] = {
         NULL
 };
 
+#define ZROK_PROXY_CFG_V1 "zrok.proxy.v1"
+#define ZROK_PROXY_CFG_V1_MODEL(XX, ...) \
+XX(auth_scheme, string, none, auth_scheme, __VA_ARGS__) \
+XX(basic_auth, string, none, basic_auth, __VA_ARGS__) \
+XX(oauth, string, none, oauth, __VA_ARGS__)
+DECLARE_MODEL(zrok_proxy_cfg_v1, ZROK_PROXY_CFG_V1_MODEL)
 
 /**
  * This function is responsible for calling the JavaScript callback function 
@@ -86,12 +92,6 @@ void on_ziti_init(ziti_context _ztx, int status, void* ctx) {
   // Set the global ztx context variable
   ztx = _ztx;
 
-  if (status == ZITI_OK) {
-
-    ziti_set_timeout(ztx, 5*1000);
-
-  }
-
   AddonData* addon_data = (AddonData*)ctx;
 
   // Initiate the call into the JavaScript callback. 
@@ -136,18 +136,21 @@ static void on_ziti_event(ziti_context _ztx, const ziti_event_t *event) {
       if (event->event.service.removed != NULL) {
           for (ziti_service **sp = event->event.service.removed; *sp != NULL; sp++) {
               // service_check_cb(ztx, *sp, ZITI_SERVICE_UNAVAILABLE, app_ctx);
+              ZITI_NODEJS_LOG(INFO, "Service removed [%s]", (*sp)->name);
           }
       }
 
       if (event->event.service.added != NULL) {
           for (ziti_service **sp = event->event.service.added; *sp != NULL; sp++) {
               // service_check_cb(ztx, *sp, ZITI_OK, app_ctx);
+              ZITI_NODEJS_LOG(INFO, "Service added [%s]", (*sp)->name);
           }
       }
 
       if (event->event.service.changed != NULL) {
           for (ziti_service **sp = event->event.service.changed; *sp != NULL; sp++) {
               // service_check_cb(ztx, *sp, ZITI_OK, app_ctx);
+              ZITI_NODEJS_LOG(INFO, "Service changed [%s]", (*sp)->name);
           }
       }
 
@@ -160,6 +163,11 @@ static void on_ziti_event(ziti_context _ztx, const ziti_event_t *event) {
           .hostname = {0},
           .port = 0
         };
+        zrok_proxy_cfg_v1 zrok_cfg = {
+          .auth_scheme = "",
+          .basic_auth = "",
+          .oauth = ""
+        };
 
         if (ziti_service_get_config(s, ZITI_INTERCEPT_CFG_V1, intercept, (int (*)(void *, const char *, size_t))parse_ziti_intercept_cfg_v1) == ZITI_OK) {
 
@@ -177,6 +185,9 @@ static void on_ziti_event(ziti_context _ztx, const ziti_event_t *event) {
 
         } else if (ziti_service_get_config(s, ZITI_CLIENT_CFG_V1, &clt_cfg, (int (*)(void *, const char *, unsigned long))parse_ziti_client_cfg_v1) == ZITI_OK) {
             track_service_to_hostname(s->name, clt_cfg.hostname.addr.hostname, clt_cfg.port);
+
+        } else if (ziti_service_get_config(s, ZROK_PROXY_CFG_V1, &zrok_cfg, (int (*)(void *, const char *, unsigned long))parse_ziti_client_cfg_v1) == ZITI_OK) {
+            track_service_to_hostname(s->name, s->name, 80);
         }
 
         free_ziti_intercept_cfg_v1(intercept);

package/src/ziti_listen.c

@@ -1,5 +1,5 @@
 /*
-Copyright Netfoundry, Inc.
+Copyright NetFoundry Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

package/src/ziti_sdk_version.c

@@ -1,5 +1,5 @@
 /*
-Copyright Netfoundry, Inc.
+Copyright NetFoundry Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

package/src/ziti_service_available.c

@@ -1,5 +1,5 @@
 /*
-Copyright Netfoundry, Inc.
+Copyright NetFoundry Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

package/src/ziti_services_refresh.c

@@ -0,0 +1,62 @@
+/*
+Copyright NetFoundry Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+https://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+#include "ziti-nodejs.h"
+#include <time.h> 
+
+void ziti_services_refresh(ziti_context ztx, bool now);
+
+
+/**
+ * 
+ */
+napi_value _ziti_services_refresh(napi_env env, const napi_callback_info info) {
+  napi_status status;
+  napi_value jsRetval;
+
+  ZITI_NODEJS_LOG(INFO, "ziti_services_refresh initiated");
+
+  // Now, call the C-SDK to refresh the services list
+  ziti_services_refresh(ztx, true);
+
+  status = napi_create_int32(env, 0 /* always succeed here */, &jsRetval);
+  if (status != napi_ok) {
+    napi_throw_error(env, NULL, "Unable to create return value");
+  }
+
+  return jsRetval;
+}
+
+
+/**
+ * 
+ */
+void expose_ziti_services_refresh(napi_env env, napi_value exports) {
+  napi_status status;
+  napi_value fn;
+
+  status = napi_create_function(env, NULL, 0, _ziti_services_refresh, NULL, &fn);
+  if (status != napi_ok) {
+    napi_throw_error(env, NULL, "Unable to wrap native function '_ziti_services_refresh");
+  }
+
+  status = napi_set_named_property(env, exports, "ziti_services_refresh", fn);
+  if (status != napi_ok) {
+    napi_throw_error(env, NULL, "Unable to populate exports for 'ziti_services_refresh");
+  }
+
+}
+

package/src/ziti_set_log_level.c

@@ -1,5 +1,5 @@
 /*
-Copyright Netfoundry, Inc.
+Copyright NetFoundry Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

package/src/ziti_shutdown.c

@@ -1,5 +1,5 @@
 /*
-Copyright Netfoundry, Inc.
+Copyright NetFoundry Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

package/src/ziti_websocket_connect.c

@@ -1,5 +1,5 @@
 /*
-Copyright Netfoundry, Inc.
+Copyright NetFoundry Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

package/src/ziti_websocket_write.c

@@ -1,5 +1,5 @@
 /*
-Copyright Netfoundry, Inc.
+Copyright NetFoundry Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

package/src/ziti_write.c

@@ -1,5 +1,5 @@
 /*
-Copyright Netfoundry, Inc.
+Copyright NetFoundry Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

package/vcpkg.json

@@ -10,9 +10,11 @@
     "openssl",
     "zlib",
     "llhttp",
-    "libsodium"
+    "libsodium",
+    "json-c",
+    "protobuf-c"
   ],
   "features": {
   },
   "builtin-baseline": "f14984af3738e69f197bf0e647a8dca12de92996"
-}
+}