From 7626dcba52cd5716d5ddb6dd81f5435101c5862a Mon Sep 17 00:00:00 2001 From: "Kassim, Jenna" Date: Thu, 9 Jan 2025 10:48:00 +0100 Subject: [PATCH] Remove unnecessary file and documentation --- Jenkinsfile | 54 ----------------------------------- doc/REST-API-configuration.md | 23 ++------------- 2 files changed, 3 insertions(+), 74 deletions(-) delete mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index e8283a0..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,54 +0,0 @@ -def version = '7.1.1.0' -def buildVersion = version+'.' + currentBuild.number - -properties([parameters([ - string( - defaultValue: params.gitRepository ?:'your default value', - name: 'gitRepository', - trim: true - ), - string( - defaultValue: params.artifactory ?:'your default value', - name: 'artifactory', - trim: true - ), - gitParameter(branch: '', branchFilter: '.*', - defaultValue: '*/main', description: '', name: 'gitbranch', - quickFilterEnabled: false, selectedValue: 'NONE', sortMode: 'NONE', - tagFilter: '*', type: 'PT_BRANCH_TAG') - ]) -]) - -node('docker-builds') { - environment { - CI = 'true' - } - stage('Checkout') { - checkout([$class: 'GitSCM', branches: [ - [name: gitbranch] - ], doGenerateSubmoduleConfigurations: false, extensions: [ - [$class: 'CleanBeforeCheckout', deleteUntrackedNestedRepositories: true] - ], submoduleCfg: [], userRemoteConfigs: [ - [credentialsId: 'github-sag-tkn', url: gitRepository] - ]]) - } - docker.image('node:14.15.4-alpine').inside { - withEnv([ - 'HOME=.', - ]){ - stage('Install') { - sh 'rm -f node_modules dist;npm install' - } - stage('Build') { - sh 'npm run build' - } - } - } - stage('Upload') { - withCredentials([usernamePassword(credentialsId: 'adatestNexus', - passwordVariable: 'NEXUS_PASS', usernameVariable: 'NEXUS_USER')]) { - sh 'cd dist;tar cfvz adabas-rest-webApp.tar.gz *' - sh 'curl -v -u '+env.NEXUS_USER+':'+env.NEXUS_PASS+' -X POST "'+artifactory+'/service/rest/v1/components?repository=maven-sag" -F maven2.groupId=com.softwareag.common -F maven2.artifactId=adabas-rest-webApp -F maven2.version='+version+' -F maven2.asset1=@dist/adabas-rest-webApp.tar.gz -F maven2.asset1.extension=tar.gz' - } - } -} diff --git a/doc/REST-API-configuration.md b/doc/REST-API-configuration.md index a56cb38..d17c8d5 100644 --- a/doc/REST-API-configuration.md +++ b/doc/REST-API-configuration.md @@ -147,29 +147,13 @@ Output of server log will be stored in the `log` directory of the installation. The REST server can be started manuelly with the script `startAdaRest.sh` on Unix/Linux platforms, or with `startAdaRest.bat` on Windows platforms. The manuel start of the server will open a console window to show the REST server output. -The REST server example page can be accessed via `http://localhost:` or `https://localhost:`. The initial user name is `admin` and the password `manage`. - -**Please change the password or remove the default user password of the `admin` user out of `realm.properties` file. New users can be added using the `service.` script.** +The REST server example page can be accessed via `http://localhost:` or `https://localhost:`. The initial user name is `admin` and the default password is set during the installation of the Adabas RESTful server. ## 1.9. REST Server Authentication -### 1.9.1. JAAS - -Adabas RESTful server supports the Java Authentication and Authorization Service (JAAS) security module of Java. It is possible to set up any JAAS module. - -The file `security.conf` configures the JAAS security classes used to set up the authorization. - -There are a number of modules predefined in the delivered configuration: - -| Name | Content | -|---|---| -| Adabas | Provide the hash realm access from previous version (see below) | -| LocalUnix | Use the Software AG local access security library (SSX) to enable system authorization | -| LocalWindows | Use the local system authentication | - -#### 1.9.1.1. Adabas password file +#### 1.9.1. Adabas password file -The REST server supports a minimal authentication realm. In order to set up the authentication using MD5 or SHASUM hash encoding, modify the realm.properties from the configuration subdirectory as required. By default, the user `admin` with password `manage` is defined. +The REST server supports a minimal authentication realm. In order to set up the authentication using MD5 or SHASUM hash encoding, modify the realm.properties from the configuration subdirectory as required. By default, the user `admin` with the default password set during the installation of the REST server. A simple password file called `realm.properties` contains user name and password information. The format of the password file is as following. @@ -199,7 +183,6 @@ user: MD5:d47f18dc7780fe47c24759714e2cd58f, saguser To add a new user to the `realm.properties` you can start the `server. add_user` command. -The realm.properties authentication is not used if ADASAF/RACF based authentication is configured. ##### 1.9.1.1.1. Creating an MD5 Hash