Skip to content

fix: Fixed placeholder handling for password defaults [backport release-5.6.0] #6189

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
nicolatimeus merged 1 commit into from
Feb 24, 2026
+166 −122
Merged

fix: Fixed placeholder handling for password defaults [backport release-5.6.0] #6189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 kura/org.eclipse.kura.web2/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ Import-Package: com.eclipsesource.json;version="0.9.5",
org.eclipse.kura.container.orchestration;version="[1.0,2.0)",
org.eclipse.kura.core.configuration;version="[2.0,3.0)",
org.eclipse.kura.core.configuration.metatype;version="[1.0,2.0)",
org.eclipse.kura.core.configuration.util;version="[2.0,3.0)",
org.eclipse.kura.core.keystore.util;version="[1.0,2.0)",
org.eclipse.kura.core.net;version="[1.0,2.0)",
org.eclipse.kura.core.net.util;version="[1.0,2.0)",
Expand Down
40 changes: 24 additions & 16 deletions ...rg.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/client/ui/AbstractServicesUi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2016, 2021 Eurotech and/or its affiliates and others
* Copyright (c) 2016, 2026 Eurotech and/or its affiliates and others
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
Expand Down Expand Up @@ -45,6 +45,7 @@
import org.gwtbootstrap3.client.ui.InlineRadio;
import org.gwtbootstrap3.client.ui.Input;
import org.gwtbootstrap3.client.ui.ListBox;
import com.google.gwt.user.client.ui.Panel;
import org.gwtbootstrap3.client.ui.TextArea;
import org.gwtbootstrap3.client.ui.TextBox;
import org.gwtbootstrap3.client.ui.base.TextBoxBase;
Expand Down Expand Up @@ -579,36 +580,43 @@ protected List<EditorError> validateTextBox(final GwtConfigParameter param, fina
}

protected void fillUpdatedConfiguration(FormGroup fg) {
GwtConfigParameter param = new GwtConfigParameter();
List<String> multiFieldValues = new ArrayList<>();
int fgwCount = fg.getWidgetCount();
for (int i = 0; i < fgwCount; i++) {
logger.fine("Widget: " + fg.getClass());

if (fg.getWidget(i) instanceof FormLabel) {
param = this.configurableComponent.getParameter(fg.getWidget(i).getTitle());
final GwtConfigParameter param = fillUpdatedConfigurationInternal(fg, null, multiFieldValues);

} else if (fg.getWidget(i) instanceof ListBox || fg.getWidget(i) instanceof Input
|| fg.getWidget(i) instanceof TextBoxBase) {
if (!multiFieldValues.isEmpty() && param != null) {
param.setValues(multiFieldValues.toArray(new String[] {}));
}
}

private GwtConfigParameter fillUpdatedConfigurationInternal(final Panel fg, GwtConfigParameter target,
List<String> multiFieldValues) {
for (final Widget w : fg) {
logger.fine("Widget: " + w.getClass());

if (param == null) {
if (w instanceof FormLabel) {
target = this.configurableComponent.getParameter(w.getTitle());
} else if (w instanceof Panel) {
target = fillUpdatedConfigurationInternal((Panel) w, target, multiFieldValues);
} else if (w instanceof ListBox || w instanceof Input || w instanceof TextBoxBase) {

if (target == null) {
errorLogger.warning("Missing parameter");
continue;
}
String value = getUpdatedFieldConfiguration(param, fg.getWidget(i));
String value = getUpdatedFieldConfiguration(target, w);
if (value == null) {
continue;
}
if (param.getCardinality() == 0 || param.getCardinality() == 1 || param.getCardinality() == -1) {
param.setValue(value);
if (target.getCardinality() == 0 || target.getCardinality() == 1 || target.getCardinality() == -1) {
target.setValue(value);
} else {
multiFieldValues.add(value);
}
}
}
if (!multiFieldValues.isEmpty() && param != null) {
param.setValues(multiFieldValues.toArray(new String[] {}));
}

return target;
}

protected void restoreConfiguration(GwtConfigComponent originalConfig) {
Expand Down
247 changes: 141 additions & 106 deletions kura/org.eclipse.kura.web2/src/main/java/org/eclipse/kura/web/server/util/GwtServerUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2016, 2024 Eurotech and/or its affiliates and others
* Copyright (c) 2016, 2026 Eurotech and/or its affiliates and others
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
Expand Down Expand Up @@ -45,6 +45,7 @@
import org.eclipse.kura.core.configuration.XmlComponentConfigurations;
import org.eclipse.kura.core.configuration.metatype.Tad;
import org.eclipse.kura.core.configuration.metatype.Tocd;
import org.eclipse.kura.core.configuration.util.StringUtil;
import org.eclipse.kura.driver.descriptor.DriverDescriptor;
import org.eclipse.kura.marshalling.Marshaller;
import org.eclipse.kura.rest.configuration.api.ComponentConfigurationList;
Expand Down Expand Up @@ -122,35 +123,35 @@ public static Object getObjectValue(GwtConfigParameter param) {
} else if (strValue != null && !strValue.trim().isEmpty()) {
final String trimmedValue = strValue.trim();
switch (gwtType) {
case LONG:
objValue = Long.parseLong(trimmedValue);
break;
case DOUBLE:
objValue = Double.parseDouble(trimmedValue);
break;
case FLOAT:
objValue = Float.parseFloat(trimmedValue);
break;
case INTEGER:
objValue = Integer.parseInt(trimmedValue);
break;
case SHORT:
objValue = Short.parseShort(trimmedValue);
break;
case BYTE:
objValue = Byte.parseByte(trimmedValue);
break;
case BOOLEAN:
objValue = Boolean.parseBoolean(trimmedValue);
break;
case PASSWORD:
objValue = new Password(trimmedValue);
break;
case CHAR:
objValue = Character.valueOf(trimmedValue.charAt(0));
break;
default:
break;
case LONG:
objValue = Long.parseLong(trimmedValue);
break;
case DOUBLE:
objValue = Double.parseDouble(trimmedValue);
break;
case FLOAT:
objValue = Float.parseFloat(trimmedValue);
break;
case INTEGER:
objValue = Integer.parseInt(trimmedValue);
break;
case SHORT:
objValue = Short.parseShort(trimmedValue);
break;
case BYTE:
objValue = Byte.parseByte(trimmedValue);
break;
case BOOLEAN:
objValue = Boolean.parseBoolean(trimmedValue);
break;
case PASSWORD:
objValue = new Password(trimmedValue);
break;
case CHAR:
objValue = Character.valueOf(trimmedValue.charAt(0));
break;
default:
break;
}
}
return objValue;
Expand All @@ -163,117 +164,151 @@ public static Object[] getObjectValues(GwtConfigParameter param, String[] defaul
List<String> trimmedValues = Stream.of(defaultValues).map(String::trim).collect(Collectors.toList());

switch (type) {
case BOOLEAN:
for (String value : trimmedValues) {
if (!value.isEmpty()) {
values.add(Boolean.valueOf(value));
}
case BOOLEAN:
for (String value : trimmedValues) {
if (!value.isEmpty()) {
values.add(Boolean.valueOf(value));
}
return values.toArray(new Boolean[] {});
}
return values.toArray(new Boolean[] {});

case BYTE:
for (String value : trimmedValues) {
if (!value.isEmpty()) {
values.add(Byte.valueOf(value));
}
case BYTE:
for (String value : trimmedValues) {
if (!value.isEmpty()) {
values.add(Byte.valueOf(value));
}
return values.toArray(new Byte[] {});
}
return values.toArray(new Byte[] {});

case CHAR:
for (String value : trimmedValues) {
if (!value.isEmpty()) {
values.add(new Character(value.charAt(0)));
}
case CHAR:
for (String value : trimmedValues) {
if (!value.isEmpty()) {
values.add(new Character(value.charAt(0)));
}
return values.toArray(new Character[] {});
}
return values.toArray(new Character[] {});

case DOUBLE:
for (String value : trimmedValues) {
if (!value.isEmpty()) {
values.add(Double.valueOf(value));
}
case DOUBLE:
for (String value : trimmedValues) {
if (!value.isEmpty()) {
values.add(Double.valueOf(value));
}
return values.toArray(new Double[] {});
}
return values.toArray(new Double[] {});

case FLOAT:
for (String value : trimmedValues) {
if (!value.isEmpty()) {
values.add(Float.valueOf(value));
}
case FLOAT:
for (String value : trimmedValues) {
if (!value.isEmpty()) {
values.add(Float.valueOf(value));
}
return values.toArray(new Float[] {});
}
return values.toArray(new Float[] {});

case INTEGER:
for (String value : trimmedValues) {
if (!value.isEmpty()) {
values.add(Integer.valueOf(value));
}
case INTEGER:
for (String value : trimmedValues) {
if (!value.isEmpty()) {
values.add(Integer.valueOf(value));
}
return values.toArray(new Integer[] {});
}
return values.toArray(new Integer[] {});

case LONG:
for (String value : trimmedValues) {
if (!value.isEmpty()) {
values.add(Long.valueOf(value));
}
case LONG:
for (String value : trimmedValues) {
if (!value.isEmpty()) {
values.add(Long.valueOf(value));
}
return values.toArray(new Long[] {});
}
return values.toArray(new Long[] {});

case SHORT:
for (String value : trimmedValues) {
if (!value.isEmpty()) {
values.add(Short.valueOf(value));
}
case SHORT:
for (String value : trimmedValues) {
if (!value.isEmpty()) {
values.add(Short.valueOf(value));
}
return values.toArray(new Short[] {});
}
return values.toArray(new Short[] {});

case PASSWORD:
for (String value : trimmedValues) {
if (!value.isEmpty()) {
values.add(new Password(value));
}
case PASSWORD:
for (String value : trimmedValues) {
if (!value.isEmpty()) {
values.add(new Password(value));
}
return values.toArray(new Password[] {});
}
return values.toArray(new Password[] {});

case STRING:
for (String value : trimmedValues) {
if (!value.isEmpty()) {
values.add(value);
}
case STRING:
for (String value : trimmedValues) {
if (!value.isEmpty()) {
values.add(value);
}
return values.toArray(new String[] {});
default:
return null;
}
return values.toArray(new String[] {});
default:
return null;
}
}

public static Object getUserDefinedObject(GwtConfigParameter param, Object currentObjValue) {
Object objValue;

final int cardinality = param.getCardinality();
if (cardinality == 0 || cardinality == 1 || cardinality == -1) {
String strValue = param.getValue();
return getUserDefinedObjectScalar(param, currentObjValue);
} else {
return getUserDefinedObjectArray(param, currentObjValue);
}
}

if (currentObjValue instanceof Password && PASSWORD_PLACEHOLDER.equals(strValue)) {
objValue = currentObjValue;
} else {
objValue = getObjectValue(param);
private static Object getUserDefinedObjectScalar(GwtConfigParameter param, Object currentObjValue) {
String strValue = param.getValue();

if (param.getType() == GwtConfigParameterType.PASSWORD && PASSWORD_PLACEHOLDER.equals(strValue)) {

if (currentObjValue instanceof Password) {
return currentObjValue;
}
} else {
String[] strValues = param.getValues();

if (param.isRequired()) {
final String defaultValue = param.getDefault();

if (defaultValue != null && !defaultValue.trim().isEmpty()) {
final GwtConfigParameter cloned = new GwtConfigParameter(param);
cloned.setValue(defaultValue);
return getObjectValue(cloned);
}
}
}

return getObjectValue(param);
}

private static Object getUserDefinedObjectArray(GwtConfigParameter param, Object currentObjValue) {
String[] strValues = param.getValues();

if (param.getType() == GwtConfigParameterType.PASSWORD) {

Optional<String[]> current = Optional.empty();

if (currentObjValue instanceof Password[]) {
Password[] currentPasswordValue = (Password[]) currentObjValue;
current = Optional.of(Arrays.stream((Password[]) currentObjValue).map(p -> new String(p.getPassword()))
.collect(Collectors.toList()).toArray(new String[] {}));
} else if (param.isRequired()) {
final String defaultValue = param.getDefault();

if (defaultValue != null && !defaultValue.trim().isEmpty()) {
current = Optional.of(StringUtil.splitValues(defaultValue));
}
}

if (current.isPresent()) {
for (int i = 0; i < strValues.length; i++) {
if (PASSWORD_PLACEHOLDER.equals(strValues[i])) {
strValues[i] = new String(currentPasswordValue[i].getPassword());
if (PASSWORD_PLACEHOLDER.equals(strValues[i]) && i < current.get().length) {
strValues[i] = current.get()[i];
}
}
}

objValue = getObjectValues(param, strValues);
}
return objValue;

return getObjectValues(param, strValues);
}

/**
Expand Down