diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..37285699 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,8 @@ +**/node_modules/ +node_modules +**/vue.config.js +vue.config.js +Dockerfile +.env.* +.env +README.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 0adcd875..4adc7dee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [5.0.8] - 2025-02-13 + +### Fixed + +- Regex in repo's +- Jwt token issuer added (use env variable ACCESS_TOKEN_ISSUER) - credits to le-martre for the fix +- maxBuffer causing abort by operator, adding PROCESS_MAX_BUFFER variable. + +### Changed + +- The admin user can now be removed, and will be recreated automatically if needed at first start. + use env variables ADMIN_USERNAME and ADMIN_PASSWORD. + +### Added + +- YTT extra environment variable (see help) +- Role options (showDesigner, showLogs, showSettings, ...) allowing for custom semi-admin or designer roles +- Added branch to repos + ## [5.0.7] - 2024-10-03 ### Added @@ -756,7 +775,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Allow change password for current local user - Start tracking versions -[Unreleased]: https://github.com/ansibleguy76/ansibleforms/compare/5.0.7...HEAD +[Unreleased]: https://github.com/ansibleguy76/ansibleforms/compare/5.0.8...HEAD + +[5.0.8]: https://github.com/ansibleguy76/ansibleforms/compare/5.0.7...5.0.8 [5.0.7]: https://github.com/ansibleguy76/ansibleforms/compare/5.0.6...5.0.7 diff --git a/server/Dockerfile b/Dockerfile similarity index 74% rename from server/Dockerfile rename to Dockerfile index 5b84eb73..717c4265 100644 --- a/server/Dockerfile +++ b/Dockerfile @@ -45,20 +45,41 @@ RUN npm install -g npm@9.8.1 FROM node AS tmp_builder -# Use /app -WORKDIR /app - -# Copy package.json and package-lock.json to /app -COPY package*.json ./ - # Update npm RUN npm install -g npm@9.8.1 +# Install vue cli service +RUN npm install -g @vue/cli-service + +# Use /app/client +WORKDIR /app/client + +# Copy client package.json and package-lock.json to /app/client +COPY ./client/package*.json ./ + +# install node modules for client +RUN npm install + +# Copy the rest of the code +COPY ./client . + +# build client +RUN npm run build + +# Use /app/server +WORKDIR /app/server + +# Copy package.json and package-lock.json to /app/server +COPY ./server/package*.json ./ + # install node modules RUN npm install # Copy the rest of the code -COPY . . +COPY ./server . + +# Copy the docs help file to /app/server +COPY ./docs/_data/help.yaml . # Invoke the build script to transpile code to js RUN npm run build @@ -66,6 +87,15 @@ RUN npm run build # Remove persistent subfolder RUN rm -rf ./dist/persistent +# Remove client subfolder +RUN rm -rf ./dist/views + +# Create the views folder +RUN mkdir -p ./dist/views + +# move client build to server +RUN mv /app/client/dist/* ./dist/views + ################################################## # final build # take base and install production app dependencies @@ -74,16 +104,16 @@ RUN rm -rf ./dist/persistent FROM nodebase as final # Copy package.json and package-lock.json -COPY package*.json ./ +COPY ./server/package*.json ./ # Install only production dependencies RUN npm i --only=production # Copy transpiled js from builder stage into the final image -COPY --from=tmp_builder /app/dist ./dist +COPY --from=tmp_builder /app/server/dist ./dist # Copy the ansible.cfg file to /etc/ansible/ directory -COPY ansible.cfg /etc/ansible/ansible.cfg +COPY ./server/ansible.cfg /etc/ansible/ansible.cfg # Use js files to run the application ENTRYPOINT ["node", "./dist/index.js"] diff --git a/server/Dockerfile-debian b/Dockerfile-debian similarity index 79% rename from server/Dockerfile-debian rename to Dockerfile-debian index dc85074b..343e81ad 100644 --- a/server/Dockerfile-debian +++ b/Dockerfile-debian @@ -66,19 +66,41 @@ RUN ansible-galaxy collection install community.mysql -p /usr/share/ansible/coll FROM node:16-alpine AS tmp_builder -# Use /app -WORKDIR /app +# Update npm +RUN npm install -g npm@9.8.1 + +# Install vue cli service +RUN npm install -g @vue/cli-service + +# Use /app/client +WORKDIR /app/client + +# Copy client package.json and package-lock.json to /app/client +COPY ./client/package*.json ./ + +# install node modules for client +RUN npm install + +# Copy the rest of the code +COPY ./client . + +# build client +RUN npm run build -# Copy package.json and package-lock.json to /app -COPY package*.json ./ +# Use /app/server +WORKDIR /app/server -# Install all dependencies -RUN npm install -g +# Copy package.json and package-lock.json to /app/server +COPY ./server/package*.json ./ +# install node modules RUN npm install # Copy the rest of the code -COPY . . +COPY ./server . + +# Copy the docs help file to /app/server +COPY ./docs/_data/help.yaml . # Invoke the build script to transpile code to js RUN npm run build @@ -86,6 +108,15 @@ RUN npm run build # Remove persistent subfolder RUN rm -rf ./dist/persistent +# Remove client subfolder +RUN rm -rf ./dist/views + +# Create the views folder +RUN mkdir -p ./dist/views + +# move client build to server +RUN mv /app/client/dist/* ./dist/views + ################################################## # final build # take base and install production app dependencies @@ -94,10 +125,10 @@ RUN rm -rf ./dist/persistent FROM debianbase as final # Copy package.json and package-lock.json -COPY package*.json ./ +COPY ./server/package*.json ./ # Copy transpiled js from builder stage into the final image -COPY --from=tmp_builder /app/dist ./dist +COPY --from=tmp_builder /app/server/dist ./dist # Install only production dependencies # the build was done in alpine, so we need to remove any previous node_modules @@ -105,7 +136,7 @@ RUN rm -rf ./dist/node_modules RUN npm install --only=production # Copy the ansible.cfg file to /etc/ansible/ directory -COPY ansible.cfg /etc/ansible/ansible.cfg +COPY ./server/ansible.cfg /etc/ansible/ansible.cfg # Use js files to run the application ENTRYPOINT ["node", "./dist/index.js"] diff --git a/app_versions.gradle b/app_versions.gradle index 9936260c..bf0d8377 100644 --- a/app_versions.gradle +++ b/app_versions.gradle @@ -1,2 +1,2 @@ -ext.version_code = 50007 -ext.version_name = "5.0.7" +ext.version_code = 50008 +ext.version_name = "5.0.8" diff --git a/client/package.json b/client/package.json index b85e4bd4..19294810 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "ansible_forms_vue", - "version": "5.0.7", + "version": "5.0.8", "private": true, "scripts": { "serve": "vue-cli-service serve", @@ -19,7 +19,7 @@ "@fortawesome/free-regular-svg-icons": "~6.5.2", "@fortawesome/free-solid-svg-icons": "~6.5.2", "@fortawesome/vue-fontawesome": "2.0.10", - "axios": "~1.7.7", + "axios": "~1.7.9", "brace": "~0.11.1", "bulma": "0.9.4", "bulma-calendar": "6.1.19", @@ -28,7 +28,7 @@ "bulma-quickview": "*", "bulmaswatch": "0.8.1", "copy-to-clipboard": "~3.3.3", - "core-js": "~3.38.1", + "core-js": "~3.40.0", "es6-promise": "~4.2.8", "highlight.js": "^10.7.2", "jsonwebtoken": "^9.0.2", @@ -55,7 +55,7 @@ "babel-eslint": "~10.1.0", "eslint": "~6.8.0", "eslint-plugin-vue": "~6.2.2", - "nodemon": "~3.1.5", + "nodemon": "~3.1.9", "sass": "~1.49.11", "sass-loader": "10.1.1", "vue-template-compiler": "~2.6.11" diff --git a/client/src/App.vue b/client/src/App.vue index d830cc03..902f6fd8 100644 --- a/client/src/App.vue +++ b/client/src/App.vue @@ -56,6 +56,10 @@ + Options : + @@ -107,6 +111,7 @@ // console.log("checking if is admin") var payload = TokenStorage.getPayload() if(payload.user && payload.user.roles){ + this.profile = payload.user this.isAdmin=payload.user.roles.includes("admin") } }, diff --git a/client/src/components/BulmaNav.vue b/client/src/components/BulmaNav.vue index f8477d17..5a90a2bb 100644 --- a/client/src/components/BulmaNav.vue +++ b/client/src/components/BulmaNav.vue @@ -18,16 +18,16 @@ Job log {{approvals}} {{(approvals==1)?"approval":"approvals"}} waiting - + Designer - + Settings
- + Logs diff --git a/client/src/components/Form.vue b/client/src/components/Form.vue index bdb5f123..32cc7b87 100644 --- a/client/src/components/Form.vue +++ b/client/src/components/Form.vue @@ -21,7 +21,7 @@ -
-
+
- + + + + + + -
+
+
+ +
@@ -470,14 +497,17 @@ import BulmaCheckRadio from './BulmaCheckRadio.vue' import BulmaEditTable from './BulmaEditTable.vue' import DatePicker from 'vue2-datepicker'; + import YAML from 'yaml' import 'vue2-datepicker/index.css'; import 'highlight.js/styles/monokai-sublime.css' import hljs from 'highlight.js/lib/core'; import javascript from 'highlight.js/lib/languages/javascript'; + import yaml from 'highlight.js/lib/languages/yaml'; import vuePlugin from "@highlightjs/vue-plugin"; hljs.registerLanguage('javascript', javascript); + hljs.registerLanguage('yaml', yaml); import Helpers from './../lib/Helpers' import Copy from 'copy-to-clipboard' @@ -487,6 +517,7 @@ import { useVuelidate } from '@vuelidate/core' import { minValue,maxValue,minLength,maxLength,helpers,requiredIf,sameAs } from '@vuelidate/validators' + Vue.use(vuePlugin); Vue.use(VueShowdown) @@ -496,7 +527,8 @@ props:{ currentForm:{type:Object}, constants:{type:Object}, - isAdmin:{type:Boolean} + isAdmin:{type:Boolean}, + profile:{type:Object} }, setup(){ return { v$: useVuelidate() } @@ -517,6 +549,7 @@ error:"" } }, + viewAsYaml:false, // flag to show extravars as yaml watchdog:0, // main loop counter loopdelay:100, // main loop delay subjob:{}, // output of last subjob @@ -671,6 +704,10 @@ return obj }, computed: { + // get the formdata as yaml + formdataYaml(){ + return YAML.stringify(this.formdata) + }, // unevaluatedFieldsWarning unevaluatedFieldsWarning(){ if(this.canSubmit){ diff --git a/client/src/lib/TokenStorage.js b/client/src/lib/TokenStorage.js index b9a5758e..9205fc62 100644 --- a/client/src/lib/TokenStorage.js +++ b/client/src/lib/TokenStorage.js @@ -28,8 +28,10 @@ var TokenStorage = { jsonPayload = decodeURIComponent(atob(base64).split('').map(function(c) { return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2); }).join('')); + // console.log(JSON.parse(jsonPayload)) return JSON.parse(jsonPayload) }catch(err){ + // console.log("Error in getPayload: " + err) return {} } }, diff --git a/client/src/main.js b/client/src/main.js index 835208b1..8ba920cf 100644 --- a/client/src/main.js +++ b/client/src/main.js @@ -28,66 +28,62 @@ import "./../public/assets/main.scss" axios.interceptors.response.use( (response) => { // Return a successful response back to the calling service return response; -}, (error) => { +}, async (error) => { // Return any error which is not due to authentication back to the calling service if (error.response?.status !== 401) { - return new Promise((resolve, reject) => { - reject(error); - }); + throw error; }else{ - // Logout user if token refresh didn't work or user is disabled - if (error.config.url == `${process.env.BASE_URL}api/v1/token` || error.response.message == 'Account is disabled.') { - // temp vue to have toast + console.log("Unauthorized detected") + console.log("Error : " + error) + + var originConfig = error?.config || {}; + const originUrl = error?.config?.url || ""; + const originResponseMessage = error?.response?.message || ""; + const originResponseErrorMessage = error?.response?.data?.error || ""; + + try{ + if(!originConfig || !originUrl){ + throw new Error("Unauthorized detected, redirecting to login (no origin config or url)") + } + + console.log("Origin url : " + originUrl) + console.log("Origin response message : " + originResponseMessage) + console.log("Origin response error message : " + originResponseErrorMessage) + + // Logout user if token refresh didn't work or user is disabled or there was no access to the resource, not token related + if (originUrl == `/api/v1/token` || originResponseMessage == 'Account is disabled.' || originResponseMessage.includes('No Access')) { + + // clear our tokens from browser and push to login + TokenStorage.clear(); + router.push({ name: 'Login', query: {from: this?.$route?.fullPath || ""} }).catch(err => {}); + throw new Error("Unauthorized detected, redirecting to login (no access)") + } + + // Try request again with new token + console.log("Trying to refresh tokens") + const newToken = await TokenStorage.getNewToken(); + + console.log("Retrying previous call with new tokens") + // New request with new token + originConfig.headers['Authorization'] = `Bearer ${newToken}`; + const retryResponse = await axios.request(originConfig); + if(retryResponse.error){ + throw retryResponse.error; + }else{ + return retryResponse; + } + + }catch(e){ + const vm = new Vue({}) var message = "Unauthorized. Access denied." - if(error.response.data && error.response.data.message){ - message += "\r\n" + error.response.data.message + if(originResponseMessage){ + message = [message,originResponseMessage,originResponseErrorMessage,e.message].join("\r\n") } vm.$toast.warning(message) - // clear our tokens from browser and push to login - TokenStorage.clear(); - router.push({ name: 'Login', query: {from: this.$route.fullPath} }).catch(err => {}); - - return new Promise((resolve, reject) => { - reject(message); - }); - } - // Try request again with new token - //console.log("Trying to refresh tokens") - try{ - return TokenStorage.getNewToken() - .then((token) => { - // console.log("Refresh done") - //console.log("Retrying previous call with new tokens") - // New request with new token - const config = error.config; - config.headers['Authorization'] = `Bearer ${token}`; + throw e - return new Promise((resolve, reject) => { - axios.request(config).then(response => { - if(response.error){ - Promise.reject(error); - reject(error); - router.push({ name: 'Login', query: {from: this.$route.fullPath} }).catch(err => {}); - }else{ - resolve(response); - } - }).catch((error) => { - Promise.reject(error); - reject(error); - router.push({ name: 'Login', query: {from: this.$route.fullPath} }).catch(err => {}); - }) - }); - }) - .catch((from) => { - // token refresh error -> let's login, unless we are already there - if(!from.includes("/login")){ - router.push({ name: 'Login', query:{from:from}}).catch(err => {}); - } - }); - }catch(err){ - console.log(err) } } }); diff --git a/client/src/router.js b/client/src/router.js index 48b83598..301cddb2 100644 --- a/client/src/router.js +++ b/client/src/router.js @@ -26,12 +26,29 @@ import ReferenceGuide from './views/ReferenceGuide.vue' import Install from './views/Install.vue' import TokenStorage from './lib/TokenStorage.js' Vue.use(Router); -const checkAdmin=(to, from, next) => { + +const checkDesigner=(to, from, next) => { + var payload = TokenStorage.getPayload() + if(payload?.user?.options?.showDesigner ?? payload?.user?.roles?.includes("admin")){ + next() + }else{ + console.log("You are not allowed to access designer") + } +} +const checkLogs=(to, from, next) => { + var payload = TokenStorage.getPayload() + if(payload?.user?.options?.showLogs ?? payload?.user?.roles?.includes("admin")){ + next() + }else{ + console.log("You are not allowed to access logs") + } +} +const checkSettings=(to, from, next) => { var payload = TokenStorage.getPayload() - if(payload?.user?.roles?.includes("admin")){ + if(payload?.user?.options?.showSettings ?? payload?.user?.roles?.includes("admin")){ next() }else{ - console.log("You are not an admin user") + console.log("You are not allowed to access settings") } } @@ -120,85 +137,85 @@ export default new Router({ path:"/groups", name:"Groups", component:Groups, - beforeEnter: checkAdmin + beforeEnter: checkSettings }, { path:"/repos", name:"Repos", component:Repos, - beforeEnter: checkAdmin + beforeEnter: checkSettings }, { path:"/users", name:"Users", component:Users, - beforeEnter: checkAdmin + beforeEnter: checkSettings }, { path:"/ldap", name:"Ldap", component:Ldap, - beforeEnter: checkAdmin + beforeEnter: checkSettings }, { path:"/azuread", name:"AzureAd", component:AzureAd, - beforeEnter: checkAdmin + beforeEnter: checkSettings }, { path:"/oidc", name:"OIDC", component:OIDC, - beforeEnter: checkAdmin + beforeEnter: checkSettings }, { path:"/settings", name:"Settings", component:Settings, - beforeEnter: checkAdmin + beforeEnter: checkSettings }, { path:"/mail_settings", name:"Settings Mail", component:MailSettings, - beforeEnter: checkAdmin + beforeEnter: checkSettings }, { path:"/awx", name:"Awx", component:Awx, - beforeEnter: checkAdmin + beforeEnter: checkSettings }, { path:"/credentials", name:"Credentials", component:Credentials, - beforeEnter: checkAdmin + beforeEnter: checkSettings }, { path:"/sshkey", name:"Sshkey", component:Sshkey, - beforeEnter: checkAdmin + beforeEnter: checkSettings }, { path:"/knownhosts", name:"KnownHost", component:KnownHosts, - beforeEnter: checkAdmin + beforeEnter: checkSettings }, { path:"/logs", name:"Logs", component:Logs, - beforeEnter: checkAdmin + beforeEnter: checkLogs }, { path:"/designer", name:"Designer", component:Designer, - beforeEnter: checkAdmin + beforeEnter: checkDesigner }, { path:"/jobs", diff --git a/client/src/views/Awx.vue b/client/src/views/Awx.vue index 92aad127..0009461f 100644 --- a/client/src/views/Awx.vue +++ b/client/src/views/Awx.vue @@ -1,5 +1,5 @@