Merge pull request #44 from sasjs/vpn-connection

chore: added vpn connection
fix: bumping core
2025-12-22 18:51:19 +00:00 · 2021-06-21 14:35:19 +03:00 · 2021-06-21 11:27:06 +00:00 · 2021-06-21 11:49:37 +02:00 · 2021-06-17 16:31:29 +03:00 · 2021-06-11 00:09:16 +03:00
11 changed files with 2208 additions and 482 deletions
--- a/.github/vpn/config.ovpn
+++ b/.github/vpn/config.ovpn
@@ -0,0 +1,30 @@
+cipher AES-256-CBC
+setenv FORWARD_COMPATIBLE 1
+client
+server-poll-timeout 4
+nobind
+remote vpn.analytium.co.uk 1194 udp
+remote vpn.analytium.co.uk 1194 udp
+remote vpn.analytium.co.uk 443 tcp
+remote vpn.analytium.co.uk 1194 udp
+remote vpn.analytium.co.uk 1194 udp
+remote vpn.analytium.co.uk 1194 udp
+remote vpn.analytium.co.uk 1194 udp
+remote vpn.analytium.co.uk 1194 udp
+dev tun
+dev-type tun
+ns-cert-type server
+setenv opt tls-version-min 1.0 or-highest
+reneg-sec 604800
+sndbuf 0
+rcvbuf 0
+# NOTE: LZO commands are pushed by the Access Server at connect time.
+# NOTE: The below line doesn't disable LZO.
+comp-lzo no
+verb 3
+setenv PUSH_PEER_INFO
+
+ca ca.crt
+cert user.crt
+key user.key
+tls-auth tls.key 1
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -21,6 +21,31 @@ jobs:
        with:
          node-version: ${{ matrix.node-version }}

+      - name: Write VPN Files
+        run: |
+          echo "$CA_CRT" > .github/vpn/ca.crt
+          echo "$USER_CRT" > .github/vpn/user.crt
+          echo "$USER_KEY" > .github/vpn/user.key
+          echo "$TLS_KEY" > .github/vpn/tls.key
+        shell: bash
+        env:
+          CA_CRT: ${{ secrets.CA_CRT}}
+          USER_CRT: ${{ secrets.USER_CRT }}
+          USER_KEY: ${{ secrets.USER_KEY }}
+          TLS_KEY: ${{ secrets.TLS_KEY }}
+
+      - name: Install Open VPN
+        run: |
+          sudo apt install apt-transport-https
+          sudo wget https://swupdate.openvpn.net/repos/openvpn-repo-pkg-key.pub
+          sudo apt-key add openvpn-repo-pkg-key.pub
+          sudo wget -O /etc/apt/sources.list.d/openvpn3.list https://swupdate.openvpn.net/community/openvpn3/repos/openvpn3-bionic.list
+          sudo apt update
+          sudo apt install openvpn3
+
+      - name: Start Open VPN 3
+        run: openvpn3 session-start --config .github/vpn/config.ovpn
+
      - name: Install Doxygen
        run: sudo apt-get install doxygen

--- a/all.sas
+++ b/all.sas
@@ -9041,7 +9041,7 @@ data _null_;
  put '%local i tempds jsonengine; ';
  put ' ';
  put '/* see https://github.com/sasjs/core/issues/41 */ ';
-  put '%if %upcase(&SYSENCODING)=WLATIN1 %then %let jsonengine=PROCJSON; ';
+  put '%if "%upcase(&SYSENCODING)" ne "UTF-8" %then %let jsonengine=PROCJSON; ';
  put '%else %let jsonengine=DATASTEP; ';
  put ' ';
  put ' ';
@@ -11769,7 +11769,8 @@ filename __shake clear;
        put '%let mmxpass="Mars321";';
      run;

-      filename myref "%sysfunc(pathname(work))/mmxexport.sh";
+      filename myref "%sysfunc(pathname(work))/mmxexport.sh"
+        permission='A::u::rwx,A::g::r-x,A::o::---';
      %mm_spkexport(metaloc=%str(/my/meta/loc)
          ,outref=myref
          ,secureref=tmp
@@ -11778,7 +11779,8 @@ filename __shake clear;

  Alternatively, call without inputs to create a function style output

-      filename myref "/tmp/mmscript.sh";
+      filename myref "/tmp/mmscript.sh"
+        permission='A::u::rwx,A::g::r-x,A::o::---';
      %mm_spkexport(metaloc=%str(/my/meta/loc)
          outref=myref
          ,cmdoutloc=%str(/tmp)
@@ -11864,7 +11866,7 @@ run;
  ,msg=%str(syscc=&syscc)
 )

-%mend;/**
+%mend mm_spkexport;/**
  @file mm_tree.sas
  @brief Returns all folders / subfolder content for a particular root
  @details Shows all members and SubTrees for a particular root.
@@ -12532,7 +12534,7 @@ run;
 %local i tempds jsonengine;

 /* see https://github.com/sasjs/core/issues/41 */
-%if %upcase(&SYSENCODING)=WLATIN1 %then %let jsonengine=PROCJSON;
+%if "%upcase(&SYSENCODING)" ne "UTF-8" %then %let jsonengine=PROCJSON;
 %else %let jsonengine=DATASTEP;


@@ -12701,6 +12703,98 @@ data _null_;
 run;

 %mend;/**
+  @file
+  @brief Get metadata permissions for a particular folder
+  @details Uses the metadata batch tools to fetch the permissions for a
+  particular folder. For security, the username / password are expected to have
+  been provided in a protected directory.
+
+Usage:
+
+    %* import the macros (or make them available some other way);
+    filename mc url "https://raw.githubusercontent.com/sasjs/core/main/all.sas";
+    %inc mc;
+
+    %* create sample text file as input to the macro;
+    %* password must be in single quotes if it has special chars;
+
+    filename creds temp;
+    data _null_;
+      file creds;
+      put " -user 'sasdemo' -password 'Mars321' ";
+    run;
+
+    filename outref "%sysfunc(pathname(work))";
+    %mmx_getmetaperms(
+        metaloc=/some/meta/folder
+        ,secureref=creds
+        ,outds=work.perms
+    )
+
+  <h4> SAS Macros </h4>
+  @li mf_loc.sas
+  @li mf_getuniquefileref.sas
+  @li mp_abort.sas
+
+  @param metaloc= the metadata folder for which to export permissions
+  @param secureref= fileref containing the username / password (should point to
+    a file in a secure location)
+  @param outds= (work.mmx_getmetaperms) The output table containing the perms
+  @param effective= (YES) Displays effective access. If set to NO, only direct
+    access controls are displayed. Effective access is the net effect of all
+    applicable permission settings (both direct access controls and inherited
+    permissions).
+  @param onlyGroup= (0) Display access for only the specified user group.
+  @param onlyUser= (0) Display access for only the specified user.
+
+  @version 9.4
+  @author Allan Bowe
+
+**/
+
+%macro mmx_getmetaperms(metaloc=
+  ,secureref=
+  ,outds=work.mmx_getmetaperms
+  ,effective=YES
+  ,onlygroup=0
+  ,onlyuser=0
+);
+
+%local host port path mmxuser mmxpass eff filt;
+%let host=%sysfunc(getoption(metaserver));
+%let port=%sysfunc(getoption(metaport));
+%let path=%mf_loc(POF)/tools/sas-show-metadata-access;
+
+%if &effective=YES %then %let eff=-effective;
+%if "&onlygroup" ne "0" %then %let filt=-onlyGroup ""&onlygroup"";
+%else %if "&onlyuser" ne "0" %then %let filt=-onlyUser ""&onlyuser"";
+
+%local fref1;
+%let fref1=%mf_getuniquefileref();
+data _null_;
+  file &fref1 lrecl=32767;
+  infile &secureref;
+  input;
+  put 'data _null_;';
+  put "infile '&path -disableX11 -host &host -port &port " _infile_ @;
+  put " ""&metaloc"" &eff &filt 2>&1' pipe lrecl=10000;";
+  put 'input;putlog _infile_;run;';
+run;
+
+data _null_;
+  infile &fref1;
+  input;list;run;
+
+%inc &fref1/nosource;
+
+
+%mp_abort(iftrue= (&syscc ne 0)
+  ,mac=&sysmacroname
+  ,msg=%str(syscc=&syscc on exit)
+)
+
+
+%mend mmx_getmetaperms;/**
  @file mmx_spkexport.sas
  @brief Exports everything in a particular metadata folder
  @details Will export everything in a metadata folder to a specified location.
@@ -13423,6 +13517,30 @@ run;
        rc =fput(fileid,'\');rc =fwrite(fileid);
        rc =fput(fileid,'\');rc =fwrite(fileid);
      end;
+      else if rec='01'x then do; /* Unprintable */
+        rc =fput(fileid,'\');rc =fwrite(fileid);
+        rc =fput(fileid,'u');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'1');rc =fwrite(fileid);
+      end;
+      else if rec='07'x then do; /* Bell Char */
+        rc =fput(fileid,'\');rc =fwrite(fileid);
+        rc =fput(fileid,'u');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'7');rc =fwrite(fileid);
+      end;
+      else if rec='1B'x then do; /* escape char */
+        rc =fput(fileid,'\');rc =fwrite(fileid);
+        rc =fput(fileid,'u');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'1');rc =fwrite(fileid);
+        rc =fput(fileid,'B');rc =fwrite(fileid);
+      end;
      else do;
        rc =fput(fileid,rec);
        rc =fwrite(fileid);
@@ -14168,6 +14286,22 @@ run;
        rc =fput(fileid,'0');rc =fwrite(fileid);
        rc =fput(fileid,'1');rc =fwrite(fileid);
      end;
+      else if rec='07'x then do; /* Bell Char */
+        rc =fput(fileid,'\');rc =fwrite(fileid);
+        rc =fput(fileid,'u');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'7');rc =fwrite(fileid);
+      end;
+      else if rec='1B'x then do; /* escape char */
+        rc =fput(fileid,'\');rc =fwrite(fileid);
+        rc =fput(fileid,'u');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'1');rc =fwrite(fileid);
+        rc =fput(fileid,'B');rc =fwrite(fileid);
+      end;
      else do;
        rc =fput(fileid,rec);
        rc =fwrite(fileid);
--- a/meta/mm_createwebservice.sas
+++ b/meta/mm_createwebservice.sas
@@ -269,7 +269,7 @@ data _null_;
  put '%local i tempds jsonengine; ';
  put ' ';
  put '/* see https://github.com/sasjs/core/issues/41 */ ';
-  put '%if %upcase(&SYSENCODING)=WLATIN1 %then %let jsonengine=PROCJSON; ';
+  put '%if "%upcase(&SYSENCODING)" ne "UTF-8" %then %let jsonengine=PROCJSON; ';
  put '%else %let jsonengine=DATASTEP; ';
  put ' ';
  put ' ';
--- a/meta/mm_spkexport.sas
+++ b/meta/mm_spkexport.sas
@@ -24,7 +24,8 @@
        put '%let mmxpass="Mars321";';
      run;

-      filename myref "%sysfunc(pathname(work))/mmxexport.sh";
+      filename myref "%sysfunc(pathname(work))/mmxexport.sh"
+        permission='A::u::rwx,A::g::r-x,A::o::---';
      %mm_spkexport(metaloc=%str(/my/meta/loc)
          ,outref=myref
          ,secureref=tmp
@@ -33,7 +34,8 @@

  Alternatively, call without inputs to create a function style output

-      filename myref "/tmp/mmscript.sh";
+      filename myref "/tmp/mmscript.sh"
+        permission='A::u::rwx,A::g::r-x,A::o::---';
      %mm_spkexport(metaloc=%str(/my/meta/loc)
          outref=myref
          ,cmdoutloc=%str(/tmp)
@@ -119,4 +121,4 @@ run;
  ,msg=%str(syscc=&syscc)
 )

-%mend;
+%mend mm_spkexport;
--- a/meta/mm_webout.sas
+++ b/meta/mm_webout.sas
@@ -39,7 +39,7 @@
 %local i tempds jsonengine;

 /* see https://github.com/sasjs/core/issues/41 */
-%if %upcase(&SYSENCODING)=WLATIN1 %then %let jsonengine=PROCJSON;
+%if "%upcase(&SYSENCODING)" ne "UTF-8" %then %let jsonengine=PROCJSON;
 %else %let jsonengine=DATASTEP;


--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -33,7 +33,6 @@
    "postinstall": "[ -d .git ] && git config core.hooksPath ./.git-hooks || true"
  },
  "devDependencies": {
-    "@sasjs/cli": "^2.22.2"
-  },
-  "dependencies": {}
+    "@sasjs/cli": "^2.27.0"
+  }
 }
--- a/sasjs/sasjsconfig.json
+++ b/sasjs/sasjsconfig.json
@@ -30,13 +30,16 @@
      "name": "viya",
      "serverUrl": "https://sas.analytium.co.uk",
      "serverType": "SASVIYA",
+      "allowInsecureRequests": false,
      "appLoc": "/Public/temp/macrocore",
-      "deployConfig": {
-        "deployServicePack": true
-      },
      "macroFolders": [
        "tests/viya"
      ],
+      "programFolders": [],
+      "deployConfig": {
+        "deployServicePack": true,
+        "deployScripts": []
+      },
      "contextName": "SAS Job Execution compute context"
    },
    {
--- a/viya/mv_createjob.sas
+++ b/viya/mv_createjob.sas
@@ -237,6 +237,30 @@ run;
        rc =fput(fileid,'\');rc =fwrite(fileid);
        rc =fput(fileid,'\');rc =fwrite(fileid);
      end;
+      else if rec='01'x then do; /* Unprintable */
+        rc =fput(fileid,'\');rc =fwrite(fileid);
+        rc =fput(fileid,'u');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'1');rc =fwrite(fileid);
+      end;
+      else if rec='07'x then do; /* Bell Char */
+        rc =fput(fileid,'\');rc =fwrite(fileid);
+        rc =fput(fileid,'u');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'7');rc =fwrite(fileid);
+      end;
+      else if rec='1B'x then do; /* escape char */
+        rc =fput(fileid,'\');rc =fwrite(fileid);
+        rc =fput(fileid,'u');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'1');rc =fwrite(fileid);
+        rc =fput(fileid,'B');rc =fwrite(fileid);
+      end;
      else do;
        rc =fput(fileid,rec);
        rc =fwrite(fileid);
--- a/viya/mv_createwebservice.sas
+++ b/viya/mv_createwebservice.sas
@@ -675,6 +675,22 @@ run;
        rc =fput(fileid,'0');rc =fwrite(fileid);
        rc =fput(fileid,'1');rc =fwrite(fileid);
      end;
+      else if rec='07'x then do; /* Bell Char */
+        rc =fput(fileid,'\');rc =fwrite(fileid);
+        rc =fput(fileid,'u');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'7');rc =fwrite(fileid);
+      end;
+      else if rec='1B'x then do; /* escape char */
+        rc =fput(fileid,'\');rc =fwrite(fileid);
+        rc =fput(fileid,'u');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'0');rc =fwrite(fileid);
+        rc =fput(fileid,'1');rc =fwrite(fileid);
+        rc =fput(fileid,'B');rc =fwrite(fileid);
+      end;
      else do;
        rc =fput(fileid,rec);
        rc =fwrite(fileid);
Author	SHA1	Message	Date
Allan Bowe	32a6d15c2e	Merge pull request #44 from sasjs/vpn-connection chore: added vpn connection	2021-06-21 14:35:19 +03:00
Allan Bowe	b109e7cead	fix: bumping core	2021-06-21 11:27:06 +00:00
Mihajlo	d291d3e287	chore: added vpn connection	2021-06-21 11:49:37 +02:00
Allan Bowe	5a2968e798	fix: supporting LATIN1 as well as WLATIN1 in mm_webout	2021-06-17 16:31:29 +03:00
Allan Bowe	120ad9a7da	fix: supporting bell cand escape characters when creating viya jobs / services with macro	2021-06-11 00:09:16 +03:00
Allan Bowe	67a81b2690	chore: updating the docs for mm_spkexport.sas	2021-06-08 20:09:23 +03:00
Allan Bowe	506cf1812f	fix: deal with dashes in sysencoding	2021-06-08 16:59:43 +03:00
Allan Bowe	8cc0eb0dd7	Merge pull request #42 from sasjs/issue41 closes #42 Issue41	2021-06-03 22:44:16 +03:00
Allan Bowe	3f49925d01	Merge pull request #40 from sasjs/dependabot/npm_and_yarn/ws-7.4.6 chore(deps): bump ws from 7.4.5 to 7.4.6	2021-06-01 17:58:49 +03:00
dependabot[bot]	c51c9c2ca9	chore(deps): bump ws from 7.4.5 to 7.4.6 Bumps [ws](https://github.com/websockets/ws) from 7.4.5 to 7.4.6. - [Release notes](https://github.com/websockets/ws/releases) - [Commits](https://github.com/websockets/ws/compare/7.4.5...7.4.6) Signed-off-by: dependabot[bot] <support@github.com>	2021-05-31 02:08:52 +00:00