Skip to content

UI: Fix Userdata registration from UI#8791

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
weizhouapache merged 2 commits into from
Jun 18, 2024
Merged

UI: Fix Userdata registration from UI #8791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f67707
UI: Fix Userdata registration from UI
Pearl1594 Mar 14, 2024
9b1c462
add isbase64 checkbox
Pearl1594 Mar 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ui/public/locales/en.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1097,6 +1097,7 @@
"label.ipv6.subnets": "IPv6 Subnets",
"label.ip.addresses": "IP Addresses",
"label.iqn": "Target IQN",
"label.is.base64.encoded": "Base64 encoded",
"label.is.in.progress": "is in progress",
"label.is.shared": "Is shared",
"label.is2faenabled": "Is 2FA enabled",
Expand Down
12 changes: 10 additions & 2 deletions ui/src/utils/plugins.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -482,6 +482,15 @@ export const fileSizeUtilPlugin = {
}
}

function isBase64 (str) {
try {
const decoded = new TextDecoder().decode(Uint8Array.from(atob(str), c => c.charCodeAt(0)))
return btoa(decoded) === str
} catch (err) {
return false
}
}

export const genericUtilPlugin = {
install (app) {
app.config.globalProperties.$isValidUuid = function (uuid) {
Expand All@@ -490,8 +499,7 @@ export const genericUtilPlugin = {
}

app.config.globalProperties.$toBase64AndURIEncoded = function (text) {
const base64regex = /^([0-9a-zA-Z+/]{4})*(([0-9a-zA-Z+/]{2}==)|([0-9a-zA-Z+/]{3}=))?$/
if (base64regex.test(text)) {
if (isBase64(text)) {

@weizhouapacheweizhouapacheMar 15, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Pearl1594
thanks for the update.
with your latest change, do we still need this ?

 if (isBase64(text)) {
return text
}

@Pearl1594Pearl1594Mar 15, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we not want the text that's not encoded to be encoded and saved in the DB .. I thought the idea of the flag was the prevent encoding an already encoded string

@weizhouapacheweizhouapacheMar 15, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Pearl1594
I think the logic can be simple as below

  • if checkbox is ticked, pass the origin input
  • if checkbox is not ticked, (Base64AndURI) encode the input and pass to API

@weizhouapacheweizhouapacheMar 15, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh, wait @Pearl1594
the method toBase64AndURIEncoded is being used in some other files..

ui/src/utils/plugins.js: app.config.globalProperties.$toBase64AndURIEncoded = function (text) {
ui/src/views/compute/CreateAutoScaleVmGroup.vue: createVmGroupData.userdata = this.$toBase64AndURIEncoded(values.userdata)
ui/src/views/compute/DeployVM.vue: deployVmData.userdata = this.$toBase64AndURIEncoded(values.userdata)
ui/src/views/compute/DeployVnfAppliance.vue: createVnfAppData.userdata = this.$toBase64AndURIEncoded(values.userdata)
ui/src/views/compute/EditVM.vue: params.userdata = this.$toBase64AndURIEncoded(values.userdata)
ui/src/views/compute/RegisterUserData.vue: params.userdata = this.$toBase64AndURIEncoded(values.userdata)
ui/src/views/compute/ResetUserData.vue: params.userdata = this.$toBase64AndURIEncoded(values.userdata)

@Pearl1594Pearl1594Mar 15, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Pearl1594 I think the logic can be simple as below

* if checkbox is ticked, pass the origin input
* if checkbox is not ticked, (Base64AndURI) encode the input and pass to API

That is what is happening in RegisterUserdata component, that we see if it's unchecked and call the encode method.

@shwstpprshwstpprMay 30, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Pearl1594@weizhouapache is there a consensus on changes here?

@Pearl1594Pearl1594May 30, 2024

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had forgotten about this PR - however, @weizhouapache 's input would be appreciated at this point.

return text
}
return encodeURIComponent(btoa(unescape(encodeURIComponent(text))))
Expand Down
9 changes: 7 additions & 2 deletions ui/src/views/compute/RegisterUserData.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,6 +43,9 @@
v-model:value="form.userdata"
:placeholder="apiParams.userdata.description"/>
</a-form-item>
<a-form-item name="isbase64" ref="isbase64" :label="$t('label.is.base64.encoded')">
<a-checkbox v-model:checked="form.isbase64"></a-checkbox>
</a-form-item>
<a-form-item name="params" ref="params">
<template #label>
<tooltip-label :title="$t('label.userdataparams')" :tooltip="apiParams.params.description"/>
Expand DownExpand Up@@ -147,7 +150,9 @@ export default {
methods: {
initForm () {
this.formRef = ref()
this.form = reactive({})
this.form = reactive({
isbase64: false
})
this.rules = reactive({
name: [{ required: true, message: this.$t('message.error.name') }],
userdata: [{ required: true, message: this.$t('message.error.userdata') }]
Expand DownExpand Up@@ -204,7 +209,7 @@ export default {
if (this.isValidValueForKey(values, 'account') && values.account.length > 0) {
params.account = values.account
}
params.userdata = this.$toBase64AndURIEncoded(values.userdata)
params.userdata = values.isbase64 ? values.userdata : this.$toBase64AndURIEncoded(values.userdata)

if (values.params != null && values.params.length > 0) {
var userdataparams = values.params.join(',')
Expand Down