fix formatting

Author: Jake Champion

integration-tests/js-compute/fixtures/client/bin/index.js

@@ -13,6 +13,9 @@ routes.set("/client/tlsJA3MD5", event => {
     return pass('ok')
 });
 routes.set("/client/tlsClientHello", event => {
+    console.log('hello');
+    console.log('event.client.tlsJA3MD5', event.client.tlsJA3MD5);
+    console.log('event.client.tlsClientHello', event.client.tlsClientHello);
     error = assert(event.client.tlsClientHello instanceof ArrayBuffer, true, 'event.client.tlsClientHello instanceof ArrayBuffer')
     if (error) { return error }
     error = assert(typeof event.client.tlsClientHello.byteLength, 'number', 'typeof event.client.tlsClientHello.byteLength')

integration-tests/js-compute/test.js

@@ -98,18 +98,18 @@ for (const fixture of testFixtures) {
             await zx`npm i`
             await $`fastly compute publish -i --quiet --token $FASTLY_API_TOKEN`
             core.endGroup()
-            
+
             // get the public domain of the deployed application
             domain = JSON.parse(await $`fastly domain list --quiet --version latest --json`)[0].Name
             core.notice(`Service is running on https://${domain}`)
-            
+
             const setupPath = join(fixturePath, 'setup.js')
             if (existsSync(setupPath)) {
                 core.startGroup('Extra set-up steps for the service')
                 await $`${setupPath}`
                 core.endGroup()
             }
-            
+
             core.startGroup('Check service is up and running')
             await retry(10, expBackoff('60s', '30s'), async () => {
                 const response = await request(`https://${domain}`)
@@ -118,9 +118,9 @@ for (const fixture of testFixtures) {
                 }
             })
             core.endGroup()
-            
+
             const { default: tests } = await import(join(fixturePath, 'tests.json'), { assert: { type: 'json' } });
-            
+
             core.startGroup('Running tests')
             let counter = 0;
             await Promise.all(Object.entries(tests).map(async ([title, test]) => {
@@ -147,7 +147,7 @@ for (const fixture of testFixtures) {
                 await $`${teardownPath}`
                 core.endGroup()
             }
-            
+
             core.startGroup('Delete service')
             // Delete the service now the tests have finished
             await zx`fastly service delete --quiet --service-name "${serviceName}" --force --token $FASTLY_API_TOKEN`

runtime/js-compute-runtime/fastly-world/fastly_world_adapter.cpp

@@ -189,23 +189,26 @@ bool fastly_http_req_downstream_client_ip_addr(fastly_world_list_u8_t *ret, fast
 bool fastly_http_req_downstream_tls_cipher_openssl_name(fastly_world_string_t *ret,
                                                         fastly_error_t *err) {
   auto default_size = 128;
-  ret->ptr = static_cast<char *>(cabi_malloc(default_size, 1));
-  auto status = fastly::req_downstream_tls_cipher_openssl_name(
-                            reinterpret_cast<char *>(ret->ptr), default_size, &ret->len);
+  ret->ptr = static_cast<char *>(cabi_malloc(default_size, 4));
+  auto status = fastly::req_downstream_tls_cipher_openssl_name(reinterpret_cast<char *>(ret->ptr),
+                                                               default_size, &ret->len);
   if (status == FASTLY_ERROR_BUFFER_LEN) {
     cabi_realloc(ret->ptr, default_size, 4, ret->len);
-    status = fastly::req_downstream_tls_cipher_openssl_name(reinterpret_cast<char *>(ret->ptr), ret->len, &ret->len);
+    status = fastly::req_downstream_tls_cipher_openssl_name(reinterpret_cast<char *>(ret->ptr),
+                                                            ret->len, &ret->len);
   }
   return convert_result(status, err);
 }
 
 bool fastly_http_req_downstream_tls_protocol(fastly_world_string_t *ret, fastly_error_t *err) {
   auto default_size = 32;
-  ret->ptr = static_cast<char *>(cabi_malloc(default_size, 1));
-  auto status = fastly::req_downstream_tls_protocol(reinterpret_cast<char *>(ret->ptr), default_size, &ret->len);
+  ret->ptr = static_cast<char *>(cabi_malloc(default_size, 4));
+  auto status = fastly::req_downstream_tls_protocol(reinterpret_cast<char *>(ret->ptr),
+                                                    default_size, &ret->len);
   if (status == FASTLY_ERROR_BUFFER_LEN) {
     cabi_realloc(ret->ptr, default_size, 4, ret->len);
-    status = fastly::req_downstream_tls_protocol(reinterpret_cast<char *>(ret->ptr), ret->len, &ret->len);
+    status = fastly::req_downstream_tls_protocol(reinterpret_cast<char *>(ret->ptr), ret->len,
+                                                 &ret->len);
   }
   return convert_result(status, err);
 }
@@ -226,11 +229,11 @@ bool fastly_http_req_downstream_tls_raw_client_certificate(fastly_world_list_u8_
 
 bool fastly_http_req_downstream_tls_ja3_md5(fastly_world_list_u8_t *ret, fastly_error_t *err) {
   auto default_size = 16;
-  ret->ptr = static_cast<uint8_t *>(cabi_malloc(default_size, 1));
+  ret->ptr = static_cast<uint8_t *>(cabi_malloc(default_size, 4));
   auto status = fastly::req_downstream_tls_ja3_md5(reinterpret_cast<char *>(ret->ptr), &ret->len);
   if (status == FASTLY_ERROR_BUFFER_LEN) {
     cabi_realloc(ret->ptr, default_size, 4, ret->len);
-    status = fastly::req_downstream_tls_ja3_md5(reinterpret_cast<char *>(ret->ptr, &ret->len);
+    status = fastly::req_downstream_tls_ja3_md5(reinterpret_cast<char *>(ret->ptr), &ret->len);
   }
   return convert_result(status, err);
 }