Feature/sso 64 upgrade kc 24.0.5

.circleci/config.yml

@@ -4,7 +4,7 @@ jobs:
     working_directory: ~/radius-plugin # directory where steps will run
 
     docker: # run the steps with Docker
-      - image: circleci/openjdk:11.0.8-node
+      - image: circleci/openjdk:17.0-node
 
     steps: # a collection of executable commands
 

.github/workflows/maven.yml

@@ -5,9 +5,12 @@ name: Java CI with Maven
 
 on:
   push:
-    branches: [ master ]
+    branches:
+      - 'feature/**'
+      - master
   pull_request:
-    branches: [ master ]
+    branches:
+      - master
 
 jobs:
   build:
@@ -16,11 +19,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 12
+    - name: Set up JDK 17
       uses: actions/setup-java@v3
       with:
         distribution: 'zulu'
-        java-version: '11'
+        java-version: '17'
     - name: Build with Maven
       run: cd keycloak-plugins && mvn clean install
     - name: Download keycloak-quarkus

.github/workflows/node.js.yml

@@ -5,9 +5,12 @@ name: Node.js Examples
 
 on:
   push:
-    branches: [ master ]
+    branches:
+      - 'feature/**'
+      - master
   pull_request:
-    branches: [ master ]
+    branches:
+      - master
 
 jobs:
   build:

.github/workflows/sonar-build.yml

@@ -2,22 +2,28 @@ name: Sonar build
 on:
   push:
     branches:
+      - 'feature/**'
       - master
   pull_request:
-    types: [opened, synchronize, reopened]
+    types:
+     - opened
+     - synchronize
+     - reopened
 jobs:
   build:
     name: Build
+    if: ${{ github.repository_owner == 'vzakharchenko' }} # fails without sonar credentials, do not run on forced repos
     runs-on: ubuntu-latest
     environment: DOCKER
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          distribution: temurin
+          java-version: 17
       - name: Cache SonarCloud packages
         uses: actions/cache@v3
         with:

.gitignore

@@ -86,8 +86,7 @@ Thumbs.db
 .env
 radius.config
 keycloak.properties
-#keycloak.json
-keycloak/data
+keycloak-quarkus/data/*
 release-steps.sh
 keycloak-plugins/*-plugin/git.properties
 keycloak-plugins/*-plugin/dependency-reduced-pom.xml

Examples/ConditionAccessRequestJSExample/server.js

@@ -1,5 +1,5 @@
 const express = require('express');
-const engine = require('express-handlebars');
+const handlebars = require('express-handlebars');
 const Client = require('node-radius-client');
 const path = require('path');
 const {dictionaries} = require('node-radius-utils');
@@ -9,7 +9,7 @@ const app = express();
 
 app.use(bodyParser.urlencoded({extended: true}));
 
-app.engine('handlebars', engine());
+app.engine('handlebars', handlebars.engine());
 app.set('view engine', 'handlebars');
 app.set('main', './views');
 

Examples/LdapOtpExample/server.js

@@ -1,5 +1,5 @@
 const express = require('express');
-const engine = require('express-handlebars');
+const handlebars = require('express-handlebars');
 const Client = require('node-radius-client');
 const path = require('path');
 const {dictionaries} = require('node-radius-utils');
@@ -9,7 +9,7 @@ const app = express();
 
 app.use(bodyParser.urlencoded({extended: true}));
 
-app.engine('handlebars', engine());
+app.engine('handlebars', handlebars.engine());
 app.set('view engine', 'handlebars');
 app.set('main', './views');
 
@@ -24,7 +24,8 @@ function renderUI(request, response, status) {
 }
 
 const radiusClient = new Client({
-    host: 'localhost',
+    host: 'ssotest01.mgm-tp.com',
+    timeout: 25000,
     dictionaries: [
         dictionaries.rfc2865.file,
         dictionaries.mikrotik.file
@@ -38,8 +39,9 @@ app.post('/', (request, response) => {
             [dictionaries.rfc2865.attributes.USER_NAME, request.body.userName],
             [dictionaries.rfc2865.attributes.USER_PASSWORD, request.body.otpPassword],
             // [],
-            ['Vendor-Specific', 14988,
-                [[dictionaries.mikrotik.attributes.MIKROTIK_REALM, Buffer.from(request.body.realm)]]],
+            // TODO - disable realm
+            // ['Vendor-Specific', 14988,
+            //     [[dictionaries.mikrotik.attributes.MIKROTIK_REALM, Buffer.from(request.body.realm)]]],
         ],
     }).then((result) => {
         console.log('result', result.code);

Examples/LdapOtpExample/views/home.hbs

@@ -8,20 +8,69 @@
         <th>Test</th>
         <th>Test Status</th>
     </tr>
+    <!--
     <tr>
-        <td><input name="userName"  type="text"></td>
-        <td> <input name="otpPassword"  type="text"></td>
-        <td> <input name="realm"  type="text" value="ldap"></td>
+        <td><input name="userName"  type="text" value="radius01"></td>
+        <td> <input name="otpPassword"  value="rad+#ius"></td>
+        <td> <input name="realm"  type="text" value="vpn-test"></td>
         <td>
                 <p>
                 Radius Shared Secret:
                 <br>
-                <input name="secret" type="password" value="secret"></p>
+                <input name="secret" value="6jvWYn7PDSsW" type="password"></p>
                 </p>
                 <p><input type="submit" value="Connect To Radius Server"></p>
         </td>
         <td>{{status}}</td>
     </tr>
+    -->
+    <!--
+    <tr>
+        <td><input name="userName"  type="text" value="test3lg"></td>
+        <td> <input name="otpPassword"  value="k79gF1jfW903"></td>
+        <td> <input name="realm"  type="text" value="vpn-test"></td>
+        <td>
+                <p>
+                Radius Shared Secret:
+                <br>
+                <input name="secret" value="6jvWYn7PDSsW" type="password"></p>
+                </p>
+                <p><input type="submit" value="Connect To Radius Server"></p>
+        </td>
+        <td>{{status}}</td>
+    </tr>
+    -->
+    <!--
+    <tr>
+        <td><input name="userName"  type="text" value="test2lg"></td>
+        <td> <input name="otpPassword"  value="Cisco@mgm123"></td>
+        <td> <input name="realm"  type="text" value="vpn-test"></td>
+        <td>
+                <p>
+                Radius Shared Secret:
+                <br>
+                <input name="secret" value="6jvWYn7PDSsW" type="password"></p>
+                </p>
+                <p><input type="submit" value="Connect To Radius Server"></p>
+        </td>
+        <td>{{status}}</td>
+    </tr>
+    -->
+    <!-- -->
+    <tr>
+        <td><input name="userName"  type="text" value="test1"></td>
+        <td> <input name="otpPassword"  value=""></td>
+        <td> <input name="realm"  type="text" value="mgmsso"></td>
+        <td>
+                <p>
+                Radius Shared Secret:
+                <br>
+                <input name="secret" value="6jvWYn7PDSsW" type="password"></p>
+                </p>
+                <p><input type="submit" value="Connect To Radius Server"></p>
+        </td>
+        <td>{{status}}</td>
+    </tr>
+    <!-- -->
 </table>
-
             </form>

Examples/OTPPasswordJSExample/server.js

@@ -1,5 +1,5 @@
 const express = require('express');
-const engine = require('express-handlebars');
+const handlebars = require('express-handlebars');
 const Client = require('node-radius-client');
 const path = require('path');
 const {dictionaries} = require('node-radius-utils');
@@ -9,7 +9,7 @@ const app = express();
 
 app.use(bodyParser.urlencoded({extended: true}));
 
-app.engine('handlebars', engine());
+app.engine('handlebars', handlebars.engine());
 app.set('view engine', 'handlebars');
 app.set('main', './views');
 

Examples/OneTimePasswordJSExample/server.js

@@ -1,7 +1,7 @@
 // index.js
 const path = require('path');
 const express = require('express');
-const engine = require('express-handlebars');
+const handlebars = require('express-handlebars');
 const Keycloak = require('keycloak-connect');
 var session = require('express-session');
 const Client = require('node-radius-client');
@@ -28,7 +28,7 @@ app.use(keycloak.middleware({
     logout: '/logout',
 }));
 
-app.engine('handlebars', engine());
+app.engine('handlebars', handlebars.engine());
 app.set('view engine', 'handlebars');
 app.set('main', './views');
 

Examples/RadiusAuthorizationJSExample/server.js

@@ -1,12 +1,12 @@
 const express = require('express');
-const engine = require('express-handlebars');
+const handlebars = require('express-handlebars');
 const Client = require('node-radius-client');
 const path = require('path');
 const {dictionaries} = require('node-radius-utils');
 const bodyParser = require('body-parser');
 
 const app = express();
-app.engine('handlebars', engine());
+app.engine('handlebars', handlebars.engine());
 app.set('view engine', 'handlebars');
 app.set('main', './views');
 

Examples/RadiusDefaultRealmJSExample/server.js

@@ -9,7 +9,7 @@ const app = express();
 
 app.use(bodyParser.urlencoded({extended: true}));
 
-app.engine('handlebars', engine());
+app.engine('handlebars', handlebars.engine());
 app.set('view engine', 'handlebars');
 app.set('main', './views');
 app.set('view engine', '.hbs');

Examples/RadiusServiceAccountJSExample/server.js

@@ -1,6 +1,6 @@
 const express = require('express');
 const jwt = require('jsonwebtoken');
-const engine = require('express-handlebars');
+const handlebars = require('express-handlebars');
 const Client = require('node-radius-client');
 const session = require('express-session');
 const path = require('path');
@@ -26,7 +26,7 @@ app.use(keycloak.middleware());
 
 app.use(bodyParser.urlencoded({extended: true}));
 
-app.engine('handlebars', engine());
+app.engine('handlebars', handlebars.engine());
 app.set('view engine', 'handlebars');
 app.set('main', './views');
 

Examples/WebAuthnJSExample/server.js

@@ -1,7 +1,7 @@
 // index.js
 const path = require('path');
 const express = require('express');
-const engine = require('express-handlebars');
+const handlebars = require('express-handlebars');
 const Keycloak = require('keycloak-connect');
 var session = require('express-session');
 const Client = require('node-radius-client');
@@ -28,7 +28,7 @@ app.use(keycloak.middleware({
     logout: '/logout',
 }));
 
-app.engine('handlebars', engine());
+app.engine('handlebars', handlebars.engine());
 app.set('view engine', 'handlebars');
 app.set('main', './views');