You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2016/11/14 08:06:56 UTC
svn commit: r1769572 - in /openmeetings/application/branches/3.1.x:
openmeetings-install/src/main/java/org/apache/openmeetings/cli/
openmeetings-install/src/main/java/org/apache/openmeetings/installation/
openmeetings-web/src/main/java/org/apache/openm...
Author: solomax
Date: Mon Nov 14 08:06:56 2016
New Revision: 1769572
URL: http://svn.apache.org/viewvc?rev=1769572&view=rev
Log:
[OPENMEETINGS-1504] user, created using web installer, has password
Modified:
openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationConfig.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
Modified: openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java?rev=1769572&r1=1769571&r2=1769572&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java Mon Nov 14 08:06:56 2016
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.cli;
+import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.openmeetings.db.util.ApplicationHelper.destroyApplication;
import static org.apache.openmeetings.db.util.UserHelper.getMinPasswdLength;
import static org.apache.openmeetings.db.util.UserHelper.invalidPassword;
@@ -29,7 +30,6 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
import java.util.Date;
import java.util.Map;
import java.util.TimeZone;
@@ -418,7 +418,7 @@ public class Admin {
try {
if (cfg.email == null || !MailUtil.matches(cfg.email)) {
- throw new AddressException("Invalid address");
+ throw new AddressException("Invalid address");
}
new InternetAddress(cfg.email, true);
} catch (AddressException ae) {
@@ -429,12 +429,12 @@ public class Admin {
System.out.println("User group was not provided, or too short, should be at least 1 character long: " + cfg.group);
System.exit(1);
}
- cfg.password = cmdl.getOptionValue("password");
+ cfg.setPassword(cmdl.getOptionValue("password"));
ConfigurationDao cfgDao = getApplicationContext().getBean(ConfigurationDao.class);
- if (invalidPassword(cfg.password, cfgDao)) {
+ if (invalidPassword(cfg.getPassword(), cfgDao)) {
System.out.print("Please enter password for the user '" + cfg.username + "':");
- cfg.password = new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8)).readLine();
- if (invalidPassword(cfg.password, cfgDao)) {
+ cfg.setPassword(new BufferedReader(new InputStreamReader(System.in, UTF_8)).readLine());
+ if (invalidPassword(cfg.getPassword(), cfgDao)) {
System.out.println("Password was not provided, or too short, should be at least " + getMinPasswdLength(cfgDao) + " character long.");
System.exit(1);
}
Modified: openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1769572&r1=1769571&r2=1769572&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java Mon Nov 14 08:06:56 2016
@@ -441,7 +441,7 @@ public class ImportInitvalues {
u.getAddress().setEmail(cfg.email);
u.getGroupUsers().add(new GroupUser(org, u));
- u = userDao.update(u, cfg.password, -1L);
+ u = userDao.update(u, cfg.getPassword(), -1L);
log.debug("Installation - User Added user-Id " + u.getId());
Modified: openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationConfig.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationConfig.java?rev=1769572&r1=1769571&r2=1769572&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationConfig.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationConfig.java Mon Nov 14 08:06:56 2016
@@ -27,16 +27,16 @@ import org.apache.openmeetings.util.cryp
public class InstallationConfig implements Serializable {
private static final long serialVersionUID = 1L;
-
+
public String appName = ConfigurationDao.DEFAULT_APP_NAME;
public String username;
- public String password;
+ private String password;
public String email;
public String group;
public String allowFrontendRegister = "1";
public String createDefaultRooms = "1";
public String ical_timeZone = "Europe/Berlin";
-
+
public String cryptClassName = SHA256Implementation.class.getCanonicalName();
//email
public Integer smtpPort = 25;
@@ -53,19 +53,27 @@ public class InstallationConfig implemen
public String ffmpegPath = "";
public String soxPath = "";
public String officePath = "";
-
+
public String defaultLangId = "1";
public String sendEmailAtRegister = "0";
public String urlFeed = "http://mail-archives.apache.org/mod_mbox/openmeetings-user/?format=atom";
public String urlFeed2 = "http://mail-archives.apache.org/mod_mbox/openmeetings-dev/?format=atom";
public String sendEmailWithVerficationCode = "0";
public String defaultExportFont = "TimesNewRoman";
- public String red5SipEnable = "no";
- public String red5SipRoomPrefix = "400";
- public String red5SipExtenContext = "rooms";
- public String replyToOrganizer = "1";
- public String baseUrl = DEFAULT_BASE_URL;
-
+ public String red5SipEnable = "no";
+ public String red5SipRoomPrefix = "400";
+ public String red5SipExtenContext = "rooms";
+ public String replyToOrganizer = "1";
+ public String baseUrl = DEFAULT_BASE_URL;
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
@Override
public String toString() {
return "InstallationConfig [allowFrontendRegister="
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java?rev=1769572&r1=1769571&r2=1769572&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java Mon Nov 14 08:06:56 2016
@@ -83,7 +83,7 @@ public class GeneralUserForm extends For
//TODO should throw exception if non admin User edit somebody else (or make all fields read-only)
add(passwordField = new PasswordTextField("password", new Model<String>()));
ConfigurationDao cfgDao = getBean(ConfigurationDao.class);
- passwordField.setRequired(false).add(minimumLength(getMinPasswdLength(cfgDao)));
+ passwordField.setResetPassword(false).setRequired(false).add(minimumLength(getMinPasswdLength(cfgDao)));
updateModelObject(getModelObject(), isAdminForm);
add(new DropDownChoice<Salutation>("salutation"
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java?rev=1769572&r1=1769571&r2=1769572&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java Mon Nov 14 08:06:56 2016
@@ -401,7 +401,8 @@ public class InstallWizard extends Abstr
protected void onInitialize() {
super.onInitialize();
add(new RequiredTextField<String>("username").setLabel(Model.of(getString("install.wizard.params.step1.username"))).add(minimumLength(USER_LOGIN_MINIMUM_LENGTH)));
- add(new PasswordTextField("password").setLabel(Model.of(getString("install.wizard.params.step1.password"))).add(minimumLength(USER_PASSWORD_MINIMUM_LENGTH)));
+ add(new PasswordTextField("password")
+ .setResetPassword(false).setLabel(Model.of(getString("install.wizard.params.step1.password"))).add(minimumLength(USER_PASSWORD_MINIMUM_LENGTH)));
add(new RequiredTextField<String>("email").setLabel(Model.of(getString("install.wizard.params.step1.email"))).add(RfcCompliantEmailAddressValidator.getInstance()));
add(new RequiredTextField<String>("group").setLabel(Model.of(getString("install.wizard.params.step1.group"))));
}
@@ -513,7 +514,7 @@ public class InstallWizard extends Abstr
public ParamsStep4() {
super(paramsStep3);
add(new RequiredTextField<String>("cryptClassName")); //Validate class
-
+
//TODO add check for red5sip connection
add(new YesNoTextDropDown("red5SipEnable"));
add(new TextField<String>("red5SipRoomPrefix"));
Modified: openmeetings/application/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java?rev=1769572&r1=1769571&r2=1769572&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java Mon Nov 14 08:06:56 2016
@@ -176,7 +176,7 @@ public abstract class AbstractJUnitDefau
private void makeDefaultScheme() throws Exception {
InstallationConfig cfg = new InstallationConfig();
cfg.username = username;
- cfg.password = userpass;
+ cfg.setPassword(userpass);
cfg.email = useremail;
cfg.group = orgname;
cfg.ical_timeZone = timeZone;