lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Correctly configure tenant config length. (#680)

Browse Source 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
This commit is contained in:
Kai Zimmermann
2018-05-07 15:05:05 +02:00
committed by GitHub
parent 87d13591e4
commit cb63ac88b8
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/model/TenantConfiguration.java
View File

@@ -15,6 +15,16 @@ package org.eclipse.hawkbit.repository.model;
*/ */
public interface TenantConfiguration extends TenantAwareBaseEntity { public interface TenantConfiguration extends TenantAwareBaseEntity {
/**
* Maximum length of tenant configuration key.
*/
int KEY_MAX_SIZE = 128;
/**
* Maximum length of tenant configuration value.
*/
int VALUE_MAX_SIZE = 512;
/** /**
* @return key of the entry * @return key of the entry
*/ */

11
hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/model/JpaTenantConfiguration.java
View File

@@ -13,7 +13,6 @@ import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.UniqueConstraint; import javax.persistence.UniqueConstraint;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
@@ -32,14 +31,14 @@ import org.eclipse.hawkbit.repository.model.TenantConfiguration;
public class JpaTenantConfiguration extends AbstractJpaTenantAwareBaseEntity implements TenantConfiguration { public class JpaTenantConfiguration extends AbstractJpaTenantAwareBaseEntity implements TenantConfiguration {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
@Column(name = "conf_key", length = 128, nullable = false, updatable = false) @Column(name = "conf_key", length = TenantConfiguration.KEY_MAX_SIZE, nullable = false, updatable = false)
@Size(max = 128) @Size(min = 1, max = TenantConfiguration.KEY_MAX_SIZE)
@NotEmpty @NotNull
private String key; private String key;
@Column(name = "conf_value", length = 512, nullable = false) @Column(name = "conf_value", length = TenantConfiguration.VALUE_MAX_SIZE, nullable = false)
@Basic @Basic
@Size(max = 512) @Size(max = TenantConfiguration.VALUE_MAX_SIZE)
@NotNull @NotNull
private String value; private String value;

3
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/authentication/CertificateAuthenticationConfigurationItem.java
View File

@@ -9,6 +9,7 @@
package org.eclipse.hawkbit.ui.tenantconfiguration.authentication; package org.eclipse.hawkbit.ui.tenantconfiguration.authentication;
import org.eclipse.hawkbit.repository.TenantConfigurationManagement; import org.eclipse.hawkbit.repository.TenantConfigurationManagement;
import org.eclipse.hawkbit.repository.model.TenantConfiguration;
import org.eclipse.hawkbit.tenancy.configuration.TenantConfigurationProperties.TenantConfigurationKey; import org.eclipse.hawkbit.tenancy.configuration.TenantConfigurationProperties.TenantConfigurationKey;
import org.eclipse.hawkbit.ui.common.builder.LabelBuilder; import org.eclipse.hawkbit.ui.common.builder.LabelBuilder;
import org.eclipse.hawkbit.ui.common.builder.TextFieldBuilder; import org.eclipse.hawkbit.ui.common.builder.TextFieldBuilder;
@@ -53,7 +54,7 @@ public class CertificateAuthenticationConfigurationItem extends AbstractBooleanT
"The SSL Issuer iRules.X509 hash, to validate against the controller request certifcate."); "The SSL Issuer iRules.X509 hash, to validate against the controller request certifcate.");
caRootAuthorityLabel.setWidthUndefined(); caRootAuthorityLabel.setWidthUndefined();
caRootAuthorityTextField = new TextFieldBuilder(160).buildTextComponent(); caRootAuthorityTextField = new TextFieldBuilder(TenantConfiguration.VALUE_MAX_SIZE).buildTextComponent();
caRootAuthorityTextField.setWidth("100%"); caRootAuthorityTextField.setWidth("100%");
caRootAuthorityTextField.addTextChangeListener(event -> caRootAuthorityChanged()); caRootAuthorityTextField.addTextChangeListener(event -> caRootAuthorityChanged());