This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new b6c4c40c6 [OPENMEETINGS-2833] remember me is dropped
b6c4c40c6 is described below
commit b6c4c40c61431aea32e0c6fa9c28a019172d38ee
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Tue Sep 8 10:31:43 2026 +0700
[OPENMEETINGS-2833] remember me is dropped
---
.../db/dao/basic/ConfigurationDao.java | 1 -
.../installation/ImportInitvalues.java | 6 -
.../openmeetings/util/OpenmeetingsVariables.java | 1 -
.../apache/openmeetings/web/app/Application.java | 40 -------
.../web/app/Application.properties.xml | 1 -
.../web/app/Application_ar.properties.xml | 1 -
.../web/app/Application_bg.properties.xml | 1 -
.../web/app/Application_bn.properties.xml | 1 -
.../web/app/Application_ca.properties.xml | 1 -
.../web/app/Application_cs.properties.xml | 1 -
.../web/app/Application_da.properties.xml | 1 -
.../web/app/Application_de.properties.xml | 1 -
.../web/app/Application_el.properties.xml | 1 -
.../web/app/Application_es.properties.xml | 1 -
.../web/app/Application_fa.properties.xml | 1 -
.../web/app/Application_fi.properties.xml | 1 -
.../web/app/Application_fr.properties.xml | 1 -
.../web/app/Application_gl.properties.xml | 1 -
.../web/app/Application_he.properties.xml | 1 -
.../web/app/Application_hi.properties.xml | 1 -
.../web/app/Application_hu.properties.xml | 1 -
.../web/app/Application_id.properties.xml | 1 -
.../web/app/Application_it.properties.xml | 1 -
.../web/app/Application_ja.properties.xml | 1 -
.../web/app/Application_ko.properties.xml | 1 -
.../web/app/Application_ku.properties.xml | 1 -
.../web/app/Application_lo.properties.xml | 1 -
.../web/app/Application_nl.properties.xml | 1 -
.../web/app/Application_pl.properties.xml | 1 -
.../web/app/Application_pt.properties.xml | 1 -
.../web/app/Application_pt_BR.properties.xml | 1 -
.../web/app/Application_ru.properties.xml | 1 -
.../web/app/Application_sk.properties.xml | 1 -
.../web/app/Application_sv.properties.xml | 1 -
.../web/app/Application_ta.properties.xml | 1 -
.../web/app/Application_th.properties.xml | 1 -
.../web/app/Application_tk.properties.xml | 1 -
.../web/app/Application_tr.properties.xml | 1 -
.../web/app/Application_uk.properties.xml | 1 -
.../web/app/Application_ur.properties.xml | 1 -
.../web/app/Application_zh_CN.properties.xml | 1 -
.../web/app/Application_zh_TW.properties.xml | 1 -
.../web/app/OmAuthenticationStrategy.java | 126 ---------------------
.../apache/openmeetings/web/app/WebSession.java | 24 ----
.../openmeetings/web/pages/auth/SignInDialog.html | 4 -
.../openmeetings/web/pages/auth/SignInDialog.java | 13 ---
.../webapp/WEB-INF/classes/openmeetings.properties | 2 -
.../web/app/TestOmAuthenticationStrategy.java | 87 --------------
48 files changed, 342 deletions(-)
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
index 27fc9bc94..75fd34b53 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/ConfigurationDao.java
@@ -524,7 +524,6 @@ public class ConfigurationDao implements
IDataProviderDao<Configuration> {
reloadRecordingEnabled();
reloadTheme();
reloadOtpEnabled();
- // NOTE 'remember me' settings are not being cached (only
required at app start)
updateCsp();
}
diff --git
a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
index 88bd3b16a..838794aac 100644
---
a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
+++
b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
@@ -86,7 +86,6 @@ import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REDIRECT
import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REGISTER_FRONTEND;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REGISTER_OAUTH;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REGISTER_SOAP;
-import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REMEMBER_ME_KEY;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REMINDER_MESSAGE;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REPLY_TO_ORGANIZER;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REST_ALLOW_ORIGIN;
@@ -395,15 +394,10 @@ public class ImportInitvalues {
+ "United, Yeti", "6.1.0"));
list.add(new Configuration(CONFIG_OTP_ENABLED,
String.valueOf(false), Configuration.Type.BOOL, "Whether or not Time-based One
Time Passwords are enabled", "6.3.0"));
- list.add(initialRememberMeKeyCfg());
return list;
}
- public static Configuration initialRememberMeKeyCfg() {
- return new Configuration(CONFIG_REMEMBER_ME_KEY, null,
Configuration.Type.STRING, "'Remember me' encryption key to crypt user data.
Please change this one regularly", "9.0.0");
- }
-
public void loadConfiguration(InstallationConfig cfg) {
for (Configuration c : initialCfgs(cfg)) {
if (cfgDao.get(c.getKey()) != null) {
diff --git
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
index 806f038c5..4879c8aea 100644
---
a/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
+++
b/openmeetings-util/src/main/java/org/apache/openmeetings/util/OpenmeetingsVariables.java
@@ -122,7 +122,6 @@ public class OpenmeetingsVariables {
public static final String CONFIG_RECORDING_ENABLED =
"recording.enabled";
public static final String CONFIG_THEME = "ui.theme";
public static final String CONFIG_OTP_ENABLED = "otp.enabled";
- public static final String CONFIG_REMEMBER_ME_KEY = "remember.me.key";
public static final int RECENT_ROOMS_COUNT = 5;
public static final int USER_LOGIN_MINIMUM_LENGTH = 4;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
index 209a0ec50..16fc7b2d7 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
@@ -18,12 +18,10 @@
*/
package org.apache.openmeetings.web.app;
-import static
org.apache.openmeetings.installation.ImportInitvalues.initialRememberMeKeyCfg;
import static org.apache.openmeetings.web.pages.HashPage.INVITATION_HASH;
import static
org.apache.openmeetings.web.user.rooms.RoomEnterBehavior.getRoomUrlFragment;
import static org.apache.openmeetings.web.util.OmUrlFragment.PROFILE_MESSAGES;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_EXT_PROCESS_TTL;
-import static
org.apache.openmeetings.util.OpenmeetingsVariables.CONFIG_REMEMBER_ME_KEY;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.getApplicationName;
import static org.apache.openmeetings.util.OpenmeetingsVariables.getBaseUrl;
import static
org.apache.openmeetings.util.OpenmeetingsVariables.getExtProcessTtl;
@@ -37,13 +35,10 @@ import static
org.wicketstuff.dashboard.DashboardContextInitializer.DASHBOARD_CO
import java.io.File;
import java.net.UnknownHostException;
-import java.security.Security;
import java.text.MessageFormat;
-import java.util.Date;
import java.util.HashSet;
import java.util.Locale;
import java.util.Map;
-import java.util.Optional;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.stream.Stream;
@@ -51,7 +46,6 @@ import java.util.stream.Stream;
import jakarta.annotation.Nonnull;
import jakarta.websocket.WebSocketContainer;
-import org.apache.commons.text.RandomStringGenerator;
import org.apache.openmeetings.IApplication;
import org.apache.openmeetings.core.sip.SipManager;
import org.apache.openmeetings.core.util.ChatWebSocketHelper;
@@ -62,7 +56,6 @@ import org.apache.openmeetings.db.dao.record.RecordingDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.basic.Client;
import org.apache.openmeetings.db.entity.basic.Client.Activity;
-import org.apache.openmeetings.db.entity.basic.Configuration;
import org.apache.openmeetings.db.entity.record.Recording;
import org.apache.openmeetings.db.entity.room.Invitation;
import org.apache.openmeetings.db.entity.room.Room;
@@ -99,7 +92,6 @@ import
org.apache.openmeetings.web.user.dashboard.admin.AdminWidgetDescriptor;
import org.apache.openmeetings.web.user.record.Mp4RecordingResourceReference;
import org.apache.openmeetings.web.user.record.PngRecordingResourceReference;
import org.apache.openmeetings.web.util.GroupLogoResourceReference;
-import org.apache.openmeetings.util.CalendarHelper;
import org.apache.openmeetings.util.OmFileHelper;
import org.apache.openmeetings.util.OmVersion;
import org.apache.openmeetings.web.util.ProfileImageResourceReference;
@@ -135,11 +127,9 @@ import org.apache.wicket.settings.ExceptionSettings;
import org.apache.wicket.spring.injection.annot.SpringComponentInjector;
import org.apache.wicket.util.string.Strings;
import org.apache.wicket.validation.validator.UrlValidator;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
import org.apache.openmeetings.mediaserver.KStream;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.ApplicationContext;
import org.springframework.stereotype.Component;
import org.wicketstuff.dashboard.WidgetRegistry;
@@ -203,13 +193,10 @@ public class Application extends
AuthenticatedWebApplication implements IApplica
private SipManager sipManager;
@Inject
private RoomManager roomManager;
- @Value("${remember.me.rotation.days:30}")
- private int rememberRotationDays;
@Override
protected void init() {
setWicketApplicationName(super.getName());
- initRememberMe();
getApplicationSettings().setAccessDeniedPage(AccessDeniedPage.class);
getApplicationSettings().setInternalErrorPage(InternalErrorPage.class);
getExceptionSettings().setUnexpectedExceptionDisplay(ExceptionSettings.SHOW_INTERNAL_ERROR_PAGE);
@@ -377,29 +364,6 @@ public class Application extends
AuthenticatedWebApplication implements IApplica
warmup();
}
- private void initRememberMe() {
- Security.addProvider(new BouncyCastleProvider());
- Configuration encKeyCfg =
Optional.ofNullable(cfgDao.get(CONFIG_REMEMBER_ME_KEY)).orElse(initialRememberMeKeyCfg());
-
- long lastUpdated =
Optional.ofNullable(encKeyCfg.getUpdated()).orElse(new Date()).getTime()
- + rememberRotationDays * CalendarHelper.ONE_DAY;
- if (Strings.isEmpty(encKeyCfg.getValue())
- || encKeyCfg.getValue().length() < 4
- || lastUpdated < new Date().getTime())
- {
- log.warn("'Remember me' key is missing/outdated, going
to regenerate");
-
- RandomStringGenerator generator = new
RandomStringGenerator.Builder()
- .withinRange('!', '~')
- .usingRandom(max ->
getSecuritySettings().getRandomSupplier().getRandom().nextInt(max))
- .get();
-
- encKeyCfg.setValue(generator.generate(20));
- cfgDao.update(encKeyCfg, null);
- }
- getSecuritySettings().setAuthenticationStrategy(new
OmAuthenticationStrategy(encKeyCfg.getValue()));
- }
-
private void warmup() {
// warm-up Inject
Client c = new Client(null, 1, null, null);
@@ -437,10 +401,6 @@ public class Application extends
AuthenticatedWebApplication implements IApplica
}
}
- public static OmAuthenticationStrategy getAuthenticationStrategy() {
- return
(OmAuthenticationStrategy)get().getSecuritySettings().getAuthenticationStrategy();
- }
-
@Override
public Class<? extends Page> getHomePage() {
return MainPage.class;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
index a5b4d5578..fc2683e3a 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
@@ -139,7 +139,6 @@
<entry key="284"><![CDATA[Report a bug]]></entry>
<entry key="286"><![CDATA[Project website
(https://openmeetings.apache.org)]]></entry>
<entry key="287"><![CDATA[User mailing list
(https://openmeetings.apache.org/mailing-lists.html)]]></entry>
- <entry key="288"><![CDATA[Remember login]]></entry>
<entry key="290"><![CDATA[Dashboard]]></entry>
<entry key="291"><![CDATA[Calendar]]></entry>
<entry key="306"><![CDATA[Camera and mic settings]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
index db4554b3b..86f663301 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
@@ -139,7 +139,6 @@
<entry key="284"><![CDATA[الإبلاغ عن خطأ]]></entry>
<entry key="286"><![CDATA[موقع المشروع
(https://openmeetings.apache.org)]]></entry>
<entry key="287"><![CDATA[القائمة البريدية للمستخدمين
(https://openmeetings.apache.org/mailing-lists.html)]]></entry>
- <entry key="288"><![CDATA[تذكر تسجيل الدخول]]></entry>
<entry key="290"><![CDATA[صفحتي]]></entry>
<entry key="291"><![CDATA[التقويم]]></entry>
<entry key="306"><![CDATA[إعدادات الكاميرا والميكروفون]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
index fb04bc420..102c9a1bb 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
@@ -139,7 +139,6 @@
<entry key="284"><![CDATA[Доклад за грешки]]></entry>
<entry key="286"><![CDATA[Сайт на проекта
(https://openmeetings.apache.org)]]></entry>
<entry key="287"><![CDATA[Потребителски мейлинг лист
(https://openmeetings.apache.org/mailing-lists.html)]]></entry>
- <entry key="288"><![CDATA[Запомни ме]]></entry>
<entry key="290"><![CDATA[Начална страница]]></entry>
<entry key="291"><![CDATA[График на срещите]]></entry>
<entry key="306"><![CDATA[Камера и микрофон]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bn.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bn.properties.xml
index 2cd68066a..e2ba114fd 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bn.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bn.properties.xml
@@ -139,7 +139,6 @@
<entry key="284"><![CDATA[একটি বাগ রিপোর্ট করুন]]></entry>
<entry key="286"><![CDATA[প্রকল্প ওয়েবসাইট
(https://openmeetings.apache.org)]]></entry>
<entry key="287"><![CDATA[ইউজার মেইলিং তালিকা
(https://openmeetings.apache.org/mailing-lists.html)]]></entry>
- <entry key="288"><![CDATA[লগইন মনে রাখুন]]></entry>
<entry key="290"><![CDATA[ড্যাশবোর্ড]]></entry>
<entry key="291"><![CDATA[পঞ্জিকা]]></entry>
<entry key="306"><![CDATA[ক্যামেরা এবং মাইক সেটিংস]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
index 6a30013ce..a9a90c1aa 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
@@ -139,7 +139,6 @@
<entry key="284"><![CDATA[Enviar "bug"]]></entry>
<entry key="286"><![CDATA[Web del Projecte
(https://openmeetings.apache.org)]]></entry>
<entry key="287"><![CDATA[Llista de correus del Projecto
(https://openmeetings.apache.org/mailing-lists.html)]]></entry>
- <entry key="288"><![CDATA[Recordar]]></entry>
<entry key="290"><![CDATA[La meva pàgina d'inici]]></entry>
<entry key="291"><![CDATA[Reunions programades]]></entry>
<entry key="306"><![CDATA[Càmera i micròfon]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
index adc1798b8..ed4d56562 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
@@ -139,7 +139,6 @@
<entry key="284"><![CDATA[Nahlášení chyb!]]></entry>
<entry key="286"><![CDATA[Stránky projektu]]></entry>
<entry key="287"><![CDATA[Archiv uživatelské korespondence]]></entry>
- <entry key="288"><![CDATA[Zapamatuj si přihlášení]]></entry>
<entry key="290"><![CDATA[Má domovská stránka]]></entry>
<entry key="291"><![CDATA[Mé plánované schůzky]]></entry>
<entry key="306"><![CDATA[Nastavení kamery a mikrofonu]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
index 9798102c0..58efc1eb9 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
@@ -139,7 +139,6 @@
<entry key="284"><![CDATA[Anmeld bugs]]></entry>
<entry key="286"><![CDATA[Projekt Webside
(https://openmeetings.apache.org)]]></entry>
<entry key="287"><![CDATA[Bruger mailliste
(https://openmeetings.apache.org/mailing-lists.html)]]></entry>
- <entry key="288"><![CDATA[Husk dit login]]></entry>
<entry key="290"><![CDATA[Min forside]]></entry>
<entry key="291"><![CDATA[Mine skemalagte møder]]></entry>
<entry key="306"><![CDATA[Cam. & Mik. Indstil.]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
index 013c514c1..a42959cdf 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
@@ -139,7 +139,6 @@
<entry key="284"><![CDATA[Fehler melden!]]></entry>
<entry key="286"><![CDATA[Projekt im Netz
(https://openmeetings.apache.org/)]]></entry>
<entry key="287"><![CDATA[Nutzer Mailing Liste
(https://openmeetings.apache.org/mailing-lists.html)]]></entry>
- <entry key="288"><![CDATA[Login merken]]></entry>
<entry key="290"><![CDATA[Meine Übersicht]]></entry>
<entry key="291"><![CDATA[Meetings planen]]></entry>
<entry key="306"><![CDATA[Kamera-/Mikro-Einstellungen]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
index f1820a072..352807392 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
@@ -139,7 +139,6 @@
<entry key="284"><![CDATA[Αναφορά Bug!]]></entry>
<entry key="286"><![CDATA[Project Website
(https://openmeetings.apache.org)]]></entry>
<entry key="287"><![CDATA[Λίστα με Email Χρηστών
(https://openmeetings.apache.org/mailing-lists.html)]]></entry>
- <entry key="288"><![CDATA[Υπενθύμιση Login]]></entry>
<entry key="290"><![CDATA[Η Αρχική Μου Σελίδα]]></entry>
<entry key="291"><![CDATA[Προγραμματισμένες Συναντήσεις]]></entry>
<entry key="306"><![CDATA[Κάμερα & Μικρόφωνο]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
index 24c984db0..769dfbc3c 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
@@ -139,7 +139,6 @@
<entry key="284"><![CDATA[Reportar un fallo]]></entry>
<entry key="286"><![CDATA[Web del Proyecto
(https://openmeetings.apache.org)]]></entry>
<entry key="287"><![CDATA[Lista de correo de usuarios
(https://openmeetings.apache.org/mailing-lists.html)]]></entry>
- <entry key="288"><![CDATA[Recordar login]]></entry>
<entry key="290"><![CDATA[Página de inicio]]></entry>
<entry key="291"><![CDATA[Calendario]]></entry>
<entry key="306"><![CDATA[Configuración de cámara y micrófono]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
index fd85625c2..3df24f785 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
@@ -139,7 +139,6 @@
<entry key="284"><![CDATA[گزارش یک خطا]]></entry>
<entry key="286"><![CDATA[وبسایت
پروژه(https://openmeetings.apache.org/)]]></entry>
<entry key="287"><![CDATA[لیست پست الکترونیک
کاربر(https://openmeetings.apache.org/mailing-lists.html)]]></entry>
- <entry key="288"><![CDATA[به خاطر سپردن ورود]]></entry>
<entry key="290"><![CDATA[صفحه خانگی من]]></entry>
<entry key="291"><![CDATA[جلسات برنامه ریزی شده من]]></entry>
<entry key="306"><![CDATA[تنظیمات دوربین و میکروفن]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
index 880c7c91c..55c04e1f4 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
@@ -139,7 +139,6 @@
<entry key="284"><![CDATA[Ilmoita bugi!]]></entry>
<entry key="286"><![CDATA[Projektin web-sivut
(https://openmeetings.apache.org)]]></entry>
<entry key="287"><![CDATA[Käyttäjien postituslista
(https://openmeetings.apache.org/mailing-lists.html)]]></entry>
- <entry key="288"><![CDATA[Muista kirjautuminen]]></entry>
<entry key="290"><![CDATA[Oma sivu]]></entry>
<entry key="291"><![CDATA[Tulevat kokoukset]]></entry>
<entry key="306"><![CDATA[Kamera ja mikrofoni]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
index f65d591da..fb890ff19 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
@@ -139,7 +139,6 @@
<entry key="284"><![CDATA[Un bug !]]></entry>
<entry key="286"><![CDATA[Site du projet
(https://openmeetings.apache.org)]]></entry>
<entry key="287"><![CDATA[Liste de diffusion pour les utilisateurs
(https://openmeetings.apache.org/mailing-lists.html)]]></entry>
- <entry key="288"><![CDATA[Se souvenir de moi]]></entry>
<entry key="290"><![CDATA[Ma page personnelle]]></entry>
<entry key="291"><![CDATA[Mes réunions programmées]]></entry>
<entry key="306"><![CDATA[Choix micro/caméra]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
index 7c6b14498..837f78fe2 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
@@ -139,7 +139,6 @@
<entry key="284"><![CDATA[Informar dun fallo!]]></entry>
<entry key="286"><![CDATA[Sitio web do proxecto
(https://openmeetings.apache.org)]]></entry>
<entry key="287"><![CDATA[Lista de correo do Proxecto
(https://openmeetings.apache.org/mailing-lists.html)]]></entry>
- <entry key="288"><![CDATA[Lembrar o inicio de sesión]]></entry>
<entry key="290"><![CDATA[A miña páxina de inicio]]></entry>
<entry key="291"><![CDATA[As miñas xuntanzas programadas]]></entry>
<entry key="306"><![CDATA[Axustes de cámara e micrófono]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml
index 6d94a5c75..e8cc9c445 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml
@@ -139,7 +139,6 @@
<entry key="284"><![CDATA[Report a bug]]></entry>
<entry key="286"><![CDATA[Project website
(https://openmeetings.apache.org)]]></entry>
<entry key="287"><![CDATA[User mailing list
(https://openmeetings.apache.org/mailing-lists.html)]]></entry>
- <entry key="288"><![CDATA[Remember login]]></entry>
<entry key="290"><![CDATA[Dashboard]]></entry>
<entry key="291"><![CDATA[Calendar]]></entry>
<entry key="306"><![CDATA[Camera and mic settings]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hi.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hi.properties.xml
index a5d633352..63c0e2133 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hi.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hi.properties.xml
@@ -139,7 +139,6 @@
<entry key="284"><![CDATA[त्रुटि सूचित करें]]></entry>
<entry key="286"><![CDATA[परियोजना की वेबसाइट
(https://openmeetings.apache.org)]]></entry>
<entry key="287"><![CDATA[प्रेषिती सूची
(https://openmeetings.apache.org/mailing-lists.html)]]></entry>
- <entry key="288"><![CDATA[लॉगिन याद रखें]]></entry>
<entry key="290"><![CDATA[नियंत्रण-पट्ट]]></entry>
<entry key="291"><![CDATA[तिथिपत्र]]></entry>
<entry key="306"><![CDATA[Camera and mic settings]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
index 577775775..3014b0e74 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
@@ -139,7 +139,6 @@
<entry key="284"><![CDATA[Hibabejel.!]]></entry>
<entry key="286"><![CDATA[Projekt weboldala
(https://openmeetings.apache.org)]]></entry>
<entry key="287"><![CDATA[Felhasználói levelezőlista
(https://openmeetings.apache.org/mailing-lists.html)]]></entry>
- <entry key="288"><![CDATA[Bejelentkezés megjegyzése]]></entry>
<entry key="290"><![CDATA[Kezdőoldalam]]></entry>
<entry key="291"><![CDATA[Találkozóim]]></entry>
<entry key="306"><![CDATA[Kamera és mikrofon beállítások]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
index 0ba25d034..17f1c63c3 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
@@ -139,7 +139,6 @@
<entry key="284"><![CDATA[laporkan bug!]]></entry>
<entry key="286"><![CDATA[Website
(https://openmeetings.apache.org)]]></entry>
<entry key="287"><![CDATA[Mailing List
(https://openmeetings.apache.org/mailing-lists.html)]]></entry>
- <entry key="288"><![CDATA[Ingat saya]]></entry>
<entry key="290"><![CDATA[Home Page saya]]></entry>
<entry key="291"><![CDATA[Jadwal Rapat]]></entry>
<entry key="306"><![CDATA[Seting Kamera dan Mic]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
index ac5e5835f..bf357a367 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
@@ -139,7 +139,6 @@
<entry key="284"><![CDATA[Bug!]]></entry>
<entry key="286"><![CDATA[Sito web del progetto
(https://openmeetings.apache.org)]]></entry>
<entry key="287"><![CDATA[Mailing List utenti
(https://openmeetings.apache.org/mailing-lists.html)]]></entry>
- <entry key="288"><![CDATA[Ricorda utente]]></entry>
<entry key="290"><![CDATA[Scrivania]]></entry>
<entry key="291"><![CDATA[Calendario]]></entry>
<entry key="306"><![CDATA[Impostazioni WebCam e Mic]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
index 72ef0e8b6..5dd0c6af7 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
@@ -139,7 +139,6 @@
<entry key="284"><![CDATA[バグ報告]]></entry>
<entry key="286"><![CDATA[プロジェクトWebサイト]]></entry>
<entry key="287"><![CDATA[ユーザーメーリングリスト]]></entry>
- <entry key="288"><![CDATA[次回から入力を省略]]></entry>
<entry key="290"><![CDATA[ダッシュボード]]></entry>
<entry key="291"><![CDATA[カレンダー]]></entry>
<entry key="306"><![CDATA[カメラとマイクの設定]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
index 779572379..9120b04be 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
@@ -139,7 +139,6 @@
<entry key="284"><![CDATA[Report a bug!]]></entry>
<entry key="286"><![CDATA[Project Website
(https://openmeetings.apache.org)]]></entry>
<entry key="287"><![CDATA[User Mailing List
(https://openmeetings.apache.org/mailing-lists.html)]]></entry>
- <entry key="288"><![CDATA[Remember Login]]></entry>
<entry key="290"><![CDATA[My Home Page]]></entry>
<entry key="291"><![CDATA[Calendar]]></entry>
<entry key="306"><![CDATA[Cam and Mic Settings]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ku.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ku.properties.xml
index ffafad875..46863d130 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ku.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ku.properties.xml
@@ -139,7 +139,6 @@
<entry key="284"><![CDATA[Report a bug]]></entry>
<entry key="286"><![CDATA[Project website
(https://openmeetings.apache.org)]]></entry>
<entry key="287"><![CDATA[User mailing list
(https://openmeetings.apache.org/mailing-lists.html)]]></entry>
- <entry key="288"><![CDATA[Remember login]]></entry>
<entry key="290"><![CDATA[Dashboard]]></entry>
<entry key="291"><![CDATA[Calendar]]></entry>
<entry key="306"><![CDATA[Camera and mic settings]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_lo.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_lo.properties.xml
index 0b828dd34..daa0509d5 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_lo.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_lo.properties.xml
@@ -139,7 +139,6 @@
<entry key="284"><![CDATA[Report a bug]]></entry>
<entry key="286"><![CDATA[Project website
(https://openmeetings.apache.org)]]></entry>
<entry key="287"><![CDATA[User mailing list
(https://openmeetings.apache.org/mailing-lists.html)]]></entry>
- <entry key="288"><![CDATA[Remember login]]></entry>
<entry key="290"><![CDATA[Dashboard]]></entry>
<entry key="291"><![CDATA[Calendar]]></entry>
<entry key="306"><![CDATA[Camera and mic settings]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
index ed4dad16f..a5ac89574 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
@@ -139,7 +139,6 @@
<entry key="284"><![CDATA[Meld probleem!]]></entry>
<entry key="286"><![CDATA[Project Webside
(https://openmeetings.apache.org)]]></entry>
<entry key="287"><![CDATA[User Mailing List
(https://openmeetings.apache.org/mailing-lists.html)]]></entry>
- <entry key="288"><![CDATA[Inloggegevens onthouden]]></entry>
<entry key="290"><![CDATA[Mijn Start Pagina]]></entry>
<entry key="291"><![CDATA[Mijn geplande overleggen]]></entry>
<entry key="306"><![CDATA[Beeld/Geluid instellingen]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
index 0ebaad76a..33a9b7637 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
@@ -139,7 +139,6 @@
<entry key="284"><![CDATA[Zgłoś błąd!]]></entry>
<entry key="286"><![CDATA[Witryna projektu
(https://openmeetings.apache.org)]]></entry>
<entry key="287"><![CDATA[Lista mailingowa użytkowników
(https://openmeetings.apache.org/mailing-lists.html)]]></entry>
- <entry key="288"><![CDATA[Zapamiętaj login i hasło]]></entry>
<entry key="290"><![CDATA[Mój kokpit]]></entry>
<entry key="291"><![CDATA[Moje zaplanowane spotkania]]></entry>
<entry key="306"><![CDATA[Ustawienia kamery]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
index f88a27a37..7f2ff68db 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
@@ -139,7 +139,6 @@
<entry key="284"><![CDATA[Reportar um bug!]]></entry>
<entry key="286"><![CDATA[Website do projeto
(https://openmeetings.apache.org)]]></entry>
<entry key="287"><![CDATA[Lista de emails
(https://openmeetings.apache.org/mailing-lists.html)]]></entry>
- <entry key="288"><![CDATA[Relembrar Login]]></entry>
<entry key="290"><![CDATA[Minha Home Page]]></entry>
<entry key="291"><![CDATA[My Reuniões Agendadas]]></entry>
<entry key="306"><![CDATA[Configurações de Cam e Mic]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
index bec550f9a..349486086 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
@@ -139,7 +139,6 @@
<entry key="284"><![CDATA[Suporte]]></entry>
<entry key="286"><![CDATA[http://www.tvqweb.com.br]]></entry>
<entry key="287"><![CDATA[http://www.tvqweb.com.br]]></entry>
- <entry key="288"><![CDATA[Relembrar Login]]></entry>
<entry key="290"><![CDATA[Minha Home Page]]></entry>
<entry key="291"><![CDATA[Calendário]]></entry>
<entry key="306"><![CDATA[Configurações de Cam e Mic]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
index 16a63bddc..2c59172c0 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
@@ -139,7 +139,6 @@
<entry key="284"><![CDATA[Ошибка?]]></entry>
<entry key="286"><![CDATA[Вебсайт проекта
(https://openmeetings.apache.org)]]></entry>
<entry key="287"><![CDATA[Список электронных адресов пользователей
(https://openmeetings.apache.org/mailing-lists.html)]]></entry>
- <entry key="288"><![CDATA[Запомнить вход в систему]]></entry>
<entry key="290"><![CDATA[Моя домашняя страница]]></entry>
<entry key="291"><![CDATA[Мои совещания]]></entry>
<entry key="306"><![CDATA[Установки камеры и микрофона]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
index 0414cc495..486b60573 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
@@ -139,7 +139,6 @@
<entry key="284"><![CDATA[Nahlásiť chybu]]></entry>
<entry key="286"><![CDATA[Stránka projektu
(https://openmeetings.apache.org)]]></entry>
<entry key="287"><![CDATA[Zoznam používateľov
(https://openmeetings.apache.org/mailing-lists.html)]]></entry>
- <entry key="288"><![CDATA[Zapamätať prihlásenie]]></entry>
<entry key="290"><![CDATA[My home page]]></entry>
<entry key="291"><![CDATA[Calendar]]></entry>
<entry key="306"><![CDATA[Nastavenie mikrofónu a kamery]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
index fe64b4f16..fb168ccb4 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
@@ -140,7 +140,6 @@
<entry key="284"><![CDATA[Rapportera en bugg]]></entry>
<entry key="286"><![CDATA[Projektets webbsida
(https://openmeetings.apache.org)]]></entry>
<entry key="287"><![CDATA[Epostlista för användare
(https://openmeetings.apache.org/mailing-lists.html)]]></entry>
- <entry key="288"><![CDATA[Kom ihåg login]]></entry>
<entry key="290"><![CDATA[Huvudsida]]></entry>
<entry key="291"><![CDATA[Kalender]]></entry>
<entry key="306"><![CDATA[Kamera- och mikrofoninställningar]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ta.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ta.properties.xml
index 6c9ffe528..4fea92486 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ta.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ta.properties.xml
@@ -139,7 +139,6 @@
<entry key="284"><![CDATA[Report a bug]]></entry>
<entry key="286"><![CDATA[Project website
(https://openmeetings.apache.org)]]></entry>
<entry key="287"><![CDATA[User mailing list
(https://openmeetings.apache.org/mailing-lists.html)]]></entry>
- <entry key="288"><![CDATA[Remember login]]></entry>
<entry key="290"><![CDATA[Dashboard]]></entry>
<entry key="291"><![CDATA[Calendar]]></entry>
<entry key="306"><![CDATA[Camera and mic settings]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
index f34674b2d..5c022a144 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
@@ -139,7 +139,6 @@
<entry key="284"><![CDATA[รายงานจุดบกพร่อง]]></entry>
<entry key="286"><![CDATA[เว็บไซต์ของโครงการ
(https://openmeetings.apache.org)]]></entry>
<entry key="287"><![CDATA[รายชื่ออีเมล์ของผู้ใช้
(https://openmeetings.apache.org/mailing-lists.html)]]></entry>
- <entry key="288"><![CDATA[จำการเข้าระบบ]]></entry>
<entry key="290"><![CDATA[หน้าหลัก]]></entry>
<entry key="291"><![CDATA[ปฏิทิน]]></entry>
<entry key="306"><![CDATA[ตั้งค่ากล้องและไมโครโฟน]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tk.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tk.properties.xml
index 6fe61e7a5..4d100dade 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tk.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tk.properties.xml
@@ -139,7 +139,6 @@
<entry key="284"><![CDATA[Report a bug]]></entry>
<entry key="286"><![CDATA[Project website
(https://openmeetings.apache.org)]]></entry>
<entry key="287"><![CDATA[User mailing list
(https://openmeetings.apache.org/mailing-lists.html)]]></entry>
- <entry key="288"><![CDATA[Remember login]]></entry>
<entry key="290"><![CDATA[Dashboard]]></entry>
<entry key="291"><![CDATA[Calendar]]></entry>
<entry key="306"><![CDATA[Camera and mic settings]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
index 35d1daef0..b282450f6 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
@@ -139,7 +139,6 @@
<entry key="284"><![CDATA[Hata bildir!]]></entry>
<entry key="286"><![CDATA[Proje Web Sitesi
(https://openmeetings.apache.org)]]></entry>
<entry key="287"><![CDATA[Kullanıcı E-Posta Listesi
(https://openmeetings.apache.org/mailing-lists.html)]]></entry>
- <entry key="288"><![CDATA[Oturumu Hatırla]]></entry>
<entry key="290"><![CDATA[Ana Sayfam]]></entry>
<entry key="291"><![CDATA[Planlanmış Toplantılarım]]></entry>
<entry key="306"><![CDATA[Kamera ve Mikrofon Ayarları]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
index ef9c4c34c..2ebc98753 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
@@ -139,7 +139,6 @@
<entry key="284"><![CDATA[Повідомити про помилки!]]></entry>
<entry key="286"><![CDATA[Сайт проекту
(https://openmeetings.apache.org)]]></entry>
<entry key="287"><![CDATA[User Mailing List
(https://openmeetings.apache.org/mailing-lists.html)]]></entry>
- <entry key="288"><![CDATA[Запам'ятати вхід]]></entry>
<entry key="290"><![CDATA[Моя домашня сторінка]]></entry>
<entry key="291"><![CDATA[Заплановані конференції]]></entry>
<entry key="306"><![CDATA[Налаштування камери і мікрофона]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ur.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ur.properties.xml
index a5b4d5578..fc2683e3a 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ur.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ur.properties.xml
@@ -139,7 +139,6 @@
<entry key="284"><![CDATA[Report a bug]]></entry>
<entry key="286"><![CDATA[Project website
(https://openmeetings.apache.org)]]></entry>
<entry key="287"><![CDATA[User mailing list
(https://openmeetings.apache.org/mailing-lists.html)]]></entry>
- <entry key="288"><![CDATA[Remember login]]></entry>
<entry key="290"><![CDATA[Dashboard]]></entry>
<entry key="291"><![CDATA[Calendar]]></entry>
<entry key="306"><![CDATA[Camera and mic settings]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
index 921f71120..7bbad3dc2 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
@@ -139,7 +139,6 @@
<entry key="284"><![CDATA[软件问题反馈]]></entry>
<entry key="286"><![CDATA[项目主页
(https://openmeetings.apache.org)]]></entry>
<entry key="287"><![CDATA[用户邮件列表
(https://openmeetings.apache.org/mailing-lists.html)]]></entry>
- <entry key="288"><![CDATA[记录登录]]></entry>
<entry key="290"><![CDATA[我的主页]]></entry>
<entry key="291"><![CDATA[我的会议日程]]></entry>
<entry key="306"><![CDATA[视频音频设置]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
index a8e55fc1b..006a9a78f 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
@@ -139,7 +139,6 @@
<entry key="284"><![CDATA[告訴我們問題!]]></entry>
<entry key="286"><![CDATA[Project Website
(https://openmeetings.apache.org)]]></entry>
<entry key="287"><![CDATA[User Mailing List
(https://openmeetings.apache.org/mailing-lists.html)]]></entry>
- <entry key="288"><![CDATA[記住登錄]]></entry>
<entry key="290"><![CDATA[我的首頁]]></entry>
<entry key="291"><![CDATA[我安排的會議]]></entry>
<entry key="306"><![CDATA[攝像机和麥克風设定]]></entry>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/OmAuthenticationStrategy.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/OmAuthenticationStrategy.java
deleted file mode 100644
index 21ef70406..000000000
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/OmAuthenticationStrategy.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License") + you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.openmeetings.web.app;
-
-import java.security.GeneralSecurityException;
-import java.security.SecureRandom;
-import java.security.spec.KeySpec;
-
-import javax.crypto.Cipher;
-import javax.crypto.SecretKey;
-import javax.crypto.SecretKeyFactory;
-import javax.crypto.spec.GCMParameterSpec;
-import javax.crypto.spec.PBEKeySpec;
-import javax.crypto.spec.SecretKeySpec;
-
-import org.apache.openmeetings.db.entity.user.User.Type;
-import org.apache.wicket.authentication.strategy.DefaultAuthenticationStrategy;
-import org.apache.wicket.util.crypt.AbstractCrypt;
-import org.apache.wicket.util.crypt.ICrypt;
-import org.apache.wicket.util.string.Strings;
-
-public class OmAuthenticationStrategy extends DefaultAuthenticationStrategy {
- private static final String COOKIE_KEY = "LoggedIn";
- private static final int SALT_LENGTH = 20;
- private static final int IV_LENGTH = 12;
- private static final int AUTH_TAG = 128;
-
- public OmAuthenticationStrategy(String encryptionKey) {
- super(COOKIE_KEY, defaultCrypt(encryptionKey));
- }
-
- /**
- * @see DefaultAuthenticationStrategy#decode(String value)
- * Additionally decodes stored login type and domain
- */
- @Override
- protected String[] decode(String value) {
- if (!Strings.isEmpty(value)) {
- String username = null;
- String password = null;
- String type = null;
- String domainId = null;
-
- String[] values = value.split(VALUE_SEPARATOR);
- if (values.length > 0 && !Strings.isEmpty(values[0])) {
- username = values[0];
- }
- if (values.length > 1 && !Strings.isEmpty(values[1])) {
- password = values[1];
- }
- if (values.length > 2 && !Strings.isEmpty(values[2])) {
- type = values[2];
- }
- if (values.length > 3 && !Strings.isEmpty(values[3])) {
- domainId = values[3];
- }
-
- return new String[] { username, password, type,
domainId };
- }
- return new String[] {};
- }
-
- public void save(final String username, final String password, final
Type type, final Long domainId) {
- if (type != Type.OAUTH) {
- super.save(username, password, type.name(),
String.valueOf(domainId));
- }
- }
-
- private static ICrypt defaultCrypt(String encKey) {
- return new AbstractCrypt() {
- @Override
- protected byte[] crypt(byte[] input, int mode) throws
GeneralSecurityException {
- final SecretKeyFactory factory =
SecretKeyFactory.getInstance("PBKDF2WITHHMACSHA256", "BC");
- final SecureRandom rnd =
Application.get().getSecuritySettings().getRandomSupplier().getRandom();
- if (mode == Cipher.ENCRYPT_MODE) {
- byte[] salt = new byte[SALT_LENGTH];
- rnd.nextBytes(salt);
- KeySpec spec = new
PBEKeySpec(encKey.toCharArray(), salt, 65536, 256);
- SecretKey secret = new
SecretKeySpec(factory.generateSecret(spec).getEncoded(), "AES");
- byte[] iv = new byte[IV_LENGTH];
- rnd.nextBytes(iv);
- Cipher enc =
Cipher.getInstance("AES/GCM/NoPadding", "BC");
- enc.init(mode, secret, new
GCMParameterSpec(AUTH_TAG, iv));
- byte[] res = enc.doFinal(input);
- byte[] result = new byte[SALT_LENGTH +
IV_LENGTH + res.length];
- System.arraycopy(salt, 0, result, 0,
SALT_LENGTH);
- System.arraycopy(iv, 0, result,
SALT_LENGTH, IV_LENGTH);
- System.arraycopy(res, 0, result,
SALT_LENGTH + IV_LENGTH, res.length);
- return result;
- } else {
- if (input.length < SALT_LENGTH +
IV_LENGTH + 1) {
- return new byte[0]; // input
too short, nothing to decode
- }
- byte[] salt = new byte[SALT_LENGTH];
- System.arraycopy(input, 0, salt, 0,
SALT_LENGTH);
- byte[] iv = new byte[IV_LENGTH];
- System.arraycopy(input, SALT_LENGTH,
iv, 0, IV_LENGTH);
- byte[] data = new byte[input.length -
SALT_LENGTH - IV_LENGTH];
- System.arraycopy(input, SALT_LENGTH +
IV_LENGTH, data, 0, data.length);
-
- KeySpec spec = new
PBEKeySpec(encKey.toCharArray(), salt, 65536, 256);
- SecretKey secret = new
SecretKeySpec(factory.generateSecret(spec).getEncoded(), "AES");
- Cipher dec =
Cipher.getInstance("AES/GCM/NoPadding", "BC");
- dec.init(mode, secret, new
GCMParameterSpec(AUTH_TAG, iv));
- return dec.doFinal(data);
- }
- }
- };
- }
-}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
index f46231d87..2676f15ac 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java
@@ -20,7 +20,6 @@ package org.apache.openmeetings.web.app;
import static org.apache.openmeetings.db.dao.user.UserDao.getNewUserInstance;
import static org.apache.openmeetings.db.util.TimezoneUtil.getTimeZone;
-import static
org.apache.openmeetings.web.app.Application.getAuthenticationStrategy;
import static org.apache.openmeetings.web.app.Application.getDashboardContext;
import static org.apache.openmeetings.web.app.Application.isInvaldSession;
import static org.apache.openmeetings.web.app.Application.removeInvalidSession;
@@ -77,7 +76,6 @@ import
org.apache.openmeetings.web.user.rooms.RoomEnterBehavior;
import org.apache.openmeetings.web.util.ExtendedClientProperties;
import org.apache.openmeetings.web.util.OmUrlFragment;
import org.apache.openmeetings.web.util.UserDashboard;
-import org.apache.wicket.authentication.IAuthenticationStrategy;
import
org.apache.wicket.authroles.authentication.AbstractAuthenticatedWebSession;
import org.apache.wicket.authroles.authorization.strategies.role.Roles;
import org.apache.wicket.injection.Injector;
@@ -177,28 +175,6 @@ public class WebSession extends
AbstractAuthenticatedWebSession implements IWebS
@Override
public boolean isSignedIn() {
- if (userId == null) {
- IAuthenticationStrategy strategy =
getAuthenticationStrategy();
- // get username and password from persistence store
- String[] data = strategy.load();
- if (data != null && data.length > 3 && data[2] != null)
{
- Long domainId = null;
- try {
- domainId = Long.valueOf(data[3]);
- } catch (Exception e) {
- //no-op
- }
- // try to sign in the user
- try {
- if (!signIn(data[0], data[1],
Type.valueOf(data[2]), domainId)) {
- // the loaded credentials are
wrong. erase them.
- strategy.remove();
- }
- } catch (Exception e) {
- //no-op, bad credentials
- }
- }
- }
return userId != null && userId.longValue() > 0;
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.html
index d7c1d069d..c74e9c3cd 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.html
@@ -37,10 +37,6 @@
</div>
<div class="row mb-1 g-0">
<div class="col-6">
- <div class="form-check">
- <input type="checkbox"
wicket:id="rememberMe" class="form-check-input"/>
- <label wicket:for="rememberMe"
class="form-check-label"><wicket:message key="288" /></label>
- </div>
</div>
<div class="col-5">
<a class="text-primary"
wicket:id="forget"><wicket:message key="311"/></a>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
index 25fb82d6f..d469d08c3 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.web.pages.auth;
-import static
org.apache.openmeetings.web.app.Application.getAuthenticationStrategy;
import static org.apache.openmeetings.web.app.UserManager.showAuth;
import static org.apache.openmeetings.web.pages.HashPage.APP_KEY;
import static org.apache.openmeetings.web.pages.HashPage.APP_TYPE_NETWORK;
@@ -36,7 +35,6 @@ import org.apache.openmeetings.db.entity.server.OAuthServer;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.User.Type;
import org.apache.openmeetings.web.app.Application;
-import org.apache.openmeetings.web.app.OmAuthenticationStrategy;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.OmAjaxClientInfoBehavior;
import org.apache.openmeetings.web.pages.HashPage;
@@ -52,7 +50,6 @@ import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.markup.html.form.ChoiceRenderer;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.Form;
@@ -82,7 +79,6 @@ public class SignInDialog extends Modal<String> {
private static final long serialVersionUID = 1L;
private final PasswordTextField passField = new
PasswordTextField("pass", Model.of(""));
private final RequiredTextField<String> loginField = new
RequiredTextField<>("login", Model.of(""));
- private boolean rememberMe = false;
private LdapConfig domain;
private NotificationPanel feedback = new NotificationPanel("feedback");
@@ -155,7 +151,6 @@ public class SignInDialog extends Modal<String> {
credentials.add(new WebMarkupContainer("ldap")
.add(new DropDownChoice<>("domain", new
PropertyModel<>(SignInDialog.this, "domain")
, ldaps, new
ChoiceRenderer<>("name", "id"))).setVisible(showLdap));
- credentials.add(new CheckBox("rememberMe", new
PropertyModel<>(SignInDialog.this, "rememberMe")).setOutputMarkupId(true));
AjaxButton ab = new AjaxButton("submit") { //FAKE
button so "submit-on-enter" works as expected
private static final long serialVersionUID = 1L;
};
@@ -294,22 +289,14 @@ public class SignInDialog extends Modal<String> {
// package private for OTP-Dialog
void finalStep(boolean signedIn, final Type type, AjaxRequestTarget
target) {
- OmAuthenticationStrategy strategy = getAuthenticationStrategy();
if (signedIn) {
setResponsePage(Application.get().getHomePage());
- if (rememberMe) {
- final String login = getLogin();
- strategy.save(login,
passField.getModelObject(), type, domain.getId());
- } else {
- strategy.remove();
- }
} else {
if (!hasErrorMessage()) {
error(getString("error.bad.credentials"));
target.add(feedback);
}
UserDao.badPwdPenalty();
- strategy.remove();
}
}
}
diff --git
a/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings.properties
b/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings.properties
index db7c53fd2..17aac4feb 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings.properties
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/openmeetings.properties
@@ -18,8 +18,6 @@
#
################## Crypt ##################
scrypt.cost=16384
-## amount of days encryption params for 'remember me' will be regenerated
-remember.me.rotation.days=30
################## Timeouts ##################
# 5000 == 5 sec
diff --git
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestOmAuthenticationStrategy.java
b/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestOmAuthenticationStrategy.java
deleted file mode 100644
index f1bb8d828..000000000
---
a/openmeetings-web/src/test/java/org/apache/openmeetings/web/app/TestOmAuthenticationStrategy.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License") + you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.openmeetings.web.app;
-
-import static java.util.UUID.randomUUID;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-
-import java.util.stream.Stream;
-
-import jakarta.servlet.http.Cookie;
-
-import org.apache.openmeetings.web.AbstractWicketTesterTest;
-import org.apache.openmeetings.db.entity.user.User;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
-
-class TestOmAuthenticationStrategy extends AbstractWicketTesterTest {
- @Test
- void testLength() {
- OmAuthenticationStrategy s = new
OmAuthenticationStrategy(randomUUID().toString());
-
- assertEquals(0, s.decode(null).length);
- assertEquals(4, s.decode("1").length);
- assertEquals(4, s.decode("1-sep-2").length);
- assertEquals(4, s.decode("1-sep-2-sep-user").length);
- assertEquals(4, s.decode("1-sep-2-sep-user-sep-3").length);
- assertEquals(4, s.decode("-sep--sep--sep-").length);
- }
-
- private static Stream<Arguments> provideAuthArgs() {
- return Stream.of(
- Arguments.of("aa", "bb", User.Type.CONTACT, null)
- , Arguments.of("bond", "James Bond", User.Type.USER,
null)
- , Arguments.of("jira-admin", "Super-Puper-Pr1vate",
User.Type.EXTERNAL, null)
- , Arguments.of("ldap-admin", "An0ther-Pr1vate_Pa$$",
User.Type.LDAP, 1L)
- , Arguments.of("oauth", "Pr1vate_Pa$$",
User.Type.OAUTH, 100L)
- );
- }
-
- @ParameterizedTest
- @MethodSource("provideAuthArgs")
- void test(String user, String pass, User.Type type, Long domainId) {
- OmAuthenticationStrategy s = new
OmAuthenticationStrategy(randomUUID().toString());
- s.save(null, null, User.Type.OAUTH, null);
- assertNull(s.load(), "Wasn't saved, should not be loaded");
-
- s.save(user, pass, type, domainId);
- copyCookies();
- String[] data = s.load();
- if (type == User.Type.OAUTH) {
- assertNull(data, "Should NOT be loaded");
- } else {
- assertNotNull(data, "Should be loaded");
-
- assertEquals(user, data[0], "username");
- assertEquals(pass, data[1], "pass");
- assertEquals(type.toString(), data[2], "type");
- assertEquals(String.valueOf(domainId), data[3],
"domainId");
- }
- }
-
- private void copyCookies() {
- for (Cookie c : tester.getResponse().getCookies()) {
- tester.getRequest().addCookie(c);
- }
- }
-}
