Skip to content

O
Openfire
Commit 9f725b9a authored by Gabriel Guardincerri's avatar Gabriel Guardincerri Committed by gguardin
Browse files
Options

[RTC-16] Unable to access OF Admin Console when shared key is changed in... 

[RTC-16] Unable to access OF Admin Console when shared key is changed in Clearspace but not in Openfire
[JM-1428] Fixed: Non-descriptive error message when OF is in an update state.
[JM-1408] Fixed: Non-descriptive error message when login to OF admin console while Clearspace is down.
[JM-1429] Fixed: Secure the shared secret of OF's CS integration admin page.

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@10667 b35dd754-fafc-0310-a699-88a17e54d16e
parent eb81e336
Hide whitespace changes
Inline Side-by-side
Showing with 647 additions and 90 deletions
src/i18n/openfire_i18n_cs_CZ.properties
View file @ 9f725b9a
......@@ -563,8 +563,12 @@ login.title=Administr\u00e1torsk\u00e1 konzole
login.hint=P\u0159ihl\u00e1\u0161en\u00ed do administr\u00e1torsk\u00e9 konzole
login.error=Chyba: Nem\u00edte povolen JavaScript. Tento n\u00e1stroj pou\u017e\u00edv\u00e1 JavaScript a v\u011bt\u0161ina funkc\u00ed nebude \
pracovat spr\u00e1vn\u011b bez jeho povolen\u00ed. Pros\u00edm znovu zapn\u011bte JavaScript a znovu na\u010dt\u011bte tuto str\u00e1nku.
login.failed=P\u0159ihl\u00e1\u0161en\u00ed selhalo: ov\u011b\u0159te, zda jsou va\u0161e u\u017eivatelsk\u00e9 jm\u00e9no a heslo spr\u00e1vn\u00e9 a \u017ee jste administr\u00e1tor \
login.failed.unauthorized=P\u0159ihl\u00e1\u0161en\u00ed selhalo: ov\u011b\u0159te, zda jsou va\u0161e u\u017eivatelsk\u00e9 jm\u00e9no a heslo spr\u00e1vn\u00e9 a \u017ee jste administr\u00e1tor \
nebo moder\u00e1tor.
login.failed.connection=Login failed: make sure your the user and group system is up and running.
login.failed.connection.clearspace=Clearspace unreachable: make sure Clearspace is up and running or click the login button again to change Openfire configuration.
login.failed.authentication=Login failed: Openfire wasn't able to authenticate itself to the users system.
login.failed.authentication.clearspace=Login failed: Clearspace shared secret is not valid, check Clearspace configuration or click the login button again to change Openfire configuration.
login.username=u\u017eivatelsk\u00e9 jm\u00e9no
login.password=heslo
login.login=P\u0159ihl\u00e1\u0161en\u00ed
......@@ -1482,6 +1486,12 @@ setup.sidebar.datasource=Nastaven\u00ed datab\u00e1ze
setup.sidebar.profile=Nastaven\u00ed profilu
setup.sidebar.admin=\u00da\u010det administr\u00e1tora
# Prelogin setup sidebar Page
prelogin.setup.sidebar.title.clearspace=Clearspace Integration
prelogin.setup.error.clearspace.sharedsecret=Openfire and Clearspace shared secret doesn't match. Use the test button for more information.
prelogin.setup.error.clearspace.connection=Openfire is not able to connect to that URI. Use the test button for more information.
# SSL settings Page
ssl.settings.title=Nastaven\u00ed zabezpe\u010den\u00ed
......@@ -2264,11 +2274,22 @@ setup.clearspace.service.secure=Secure
setup.clearspace.service.secure_help=Disable to use HTTP instead of HTTPS for connection.
setup.clearspace.service.secret=Shared Secret
setup.clearspace.service.secret_error=Enter a valid shared secret as set in Clearspace.
setup.clearspace.service.connection_error=Enter a valid configuration, use the test button for more information.
setup.clearspace.service.secret_help=Shared secret between Clearspace and Openfire.
setup.clearspace.service.test.close=Close
setup.clearspace.service.test.error-connection=An error occured while attempting to connect to Clearspace. \
Please check your Clearspace admin console, under the Real-Time tab, and verify that the URI and Shared \
Secret match what you have entered below.
setup.clearspace.service.test.error-authentication=An error occured while attempting to connect to Clearspace. \
Please check that the shared secret is that same that has Clearspace. (Invalid shared secret).
setup.clearspace.service.test.error-pageNotFound=An error occured while attempting to connect to Clearspace. \
Please check that the URI is correct and that points to your Clearspace instance. (Page not found).
setup.clearspace.service.test.error-serviceNotAvaitble=An error occured while attempting to connect to Clearspace. \
Please check Clearspace logs since there was an interal error. (Service not avaible).
setup.clearspace.service.test.error-updateState=An error occured while attempting to connect to Clearspace. \
Clearspace is in an update state. Please go to the Clearspace admin console and finish the update. (Update state).
setup.clearspace.service.test.error-unknownHost=An error occured while attempting to connect to Clearspace. \
Please check that the host is correct and that points to your Clearspace instance. (Unknown host).
setup.clearspace.service.test.status-error=Status: Error
setup.clearspace.service.test.status-success=Status: Success!
setup.clearspace.service.test.status-success.detail=A connection was successfully established to the Clearspace \
......
src/i18n/openfire_i18n_de.properties
View file @ 9f725b9a
......@@ -544,8 +544,12 @@ login.hint=Anmeldung zur Adminkonsole
login.error=Fehler: JavaScript ist nicht aktiviert. Dieses Werkzeug benutzt JavaScript und viele Teile \
werden nicht korrekt funktionieren ohne aktiviertes JavaScript. Bitte JavaScript aktivieren und \
diese Seite neu laden.
login.failed=Anmeldung fehlgeschlagen: Sicherstellen dass Benutzername und Passwort korrekt sind und \
login.failed.unauthorized=Anmeldung fehlgeschlagen: Sicherstellen dass Benutzername und Passwort korrekt sind und \
der Benutzer ein Administrator oder Moderator ist.
login.failed.connection=Login failed: make sure your the user and group system is up and running.
login.failed.connection.clearspace=Clearspace unreachable: make sure Clearspace is up and running or click the login button again to change Openfire configuration.
login.failed.authentication=Login failed: Openfire wasn't able to authenticate itself to the users system.
login.failed.authentication.clearspace=Login failed: Clearspace shared secret is not valid, check Clearspace configuration or click the login button again to change Openfire configuration.
login.username=Benutzername
login.password=Passwort
login.login=Anmeldung
......@@ -1421,6 +1425,12 @@ setup.sidebar.settings=Servereinstellungen
setup.sidebar.datasource=Datenquelle-Einstellungen
setup.sidebar.admin=Administratorenkonto
# Prelogin setup sidebar Page
prelogin.setup.sidebar.title.clearspace=Clearspace Integration
prelogin.setup.error.clearspace.sharedsecret=Openfire and Clearspace shared secret doesn't match. Use the test button for more information.
prelogin.setup.error.clearspace.connection=Openfire is not able to connect to that URI. Use the test button for more information.
# SSL settings Page
ssl.settings.title=SSL-Sicherheitseinstellungen
......@@ -2250,11 +2260,22 @@ setup.clearspace.service.secure=Secure
setup.clearspace.service.secure_help=Disable to use HTTP instead of HTTPS for connection.
setup.clearspace.service.secret=Shared Secret
setup.clearspace.service.secret_error=Enter a valid shared secret as set in Clearspace.
setup.clearspace.service.connection_error=Enter a valid configuration, use the test button for more information.
setup.clearspace.service.secret_help=Shared secret between Clearspace and Openfire.
setup.clearspace.service.test.close=Close
setup.clearspace.service.test.error-connection=An error occured while attempting to connect to Clearspace. \
Please check your Clearspace admin console, under the Real-Time tab, and verify that the URI and Shared \
Secret match what you have entered below.
setup.clearspace.service.test.error-authentication=An error occured while attempting to connect to Clearspace. \
Please check that the shared secret is that same that has Clearspace. (Invalid shared secret).
setup.clearspace.service.test.error-pageNotFound=An error occured while attempting to connect to Clearspace. \
Please check that the URI is correct and that points to your Clearspace instance. (Page not found).
setup.clearspace.service.test.error-serviceNotAvaitble=An error occured while attempting to connect to Clearspace. \
Please check Clearspace logs since there was an interal error. (Service not avaible).
setup.clearspace.service.test.error-updateState=An error occured while attempting to connect to Clearspace. \
Clearspace is in an update state. Please go to the Clearspace admin console and finish the update. (Update state).
setup.clearspace.service.test.error-unknownHost=An error occured while attempting to connect to Clearspace. \
Please check that the host is correct and that points to your Clearspace instance. (Unknown host).
setup.clearspace.service.test.status-error=Status: Error
setup.clearspace.service.test.status-success=Status: Success!
setup.clearspace.service.test.status-success.detail=A connection was successfully established to the Clearspace \
......
src/i18n/openfire_i18n_en.properties
View file @ 9f725b9a
......@@ -445,6 +445,24 @@
## Added key: 'clearspace.status.connected.adminbutton'
## Added key: 'reg.settings.ips_all'
## Added key: 'reg.settings.ips_anonymous'
## Removed key: 'login.failed'
## Added key: 'login.failed.unauthorized'
## Added key: 'login.failed.connection'
## Added key: 'login.failed.connection.clearspace'
## Added key: 'login.failed.authentication'
## Added key: 'login.failed.authentication.clearspace'
## Added key: 'setup.clearspace.service.connection_error=Enter a valid configuration, use the test button for more information.
## Added key: 'setup.clearspace.service.test.error-authentication
## Added key: 'setup.clearspace.service.test.error-pageNotFound'
## Added key: 'setup.clearspace.service.test.error-serviceNotAvaitble'
## Added key: 'setup.clearspace.service.test.error-updateState'
## Added key: 'setup.clearspace.service.test.error-unknownHost'
## Added key: 'prelogin.setup.sidebar.title.clearspace'
## Added key: 'prelogin.setup.error.clearspace.sharedsecret'
## Added key: 'prelogin.setup.error.clearspace.connection'
# Openfire
......@@ -1026,8 +1044,12 @@ login.title=Admin Console
login.hint=Admin Console Login
login.error=Error: You don't have JavaScript enabled. This tool uses JavaScript and much of it will \
not work correctly without it enabled. Please turn JavaScript back on and reload this page.
login.failed=Login failed: make sure your username and password are correct and that you're an admin \
login.failed.unauthorized=Login failed: make sure your username and password are correct and that you're an admin \
or moderator.
login.failed.connection=Login failed: make sure your the user and group system is up and running.
login.failed.connection.clearspace=Clearspace unreachable: make sure Clearspace is up and running or click the login button again to change Openfire configuration.
login.failed.authentication=Login failed: Openfire wasn't able to authenticate itself to the users system.
login.failed.authentication.clearspace=Login failed: Clearspace shared secret is not valid, check Clearspace configuration or click the login button again to change Openfire configuration.
login.username=username
login.password=password
login.login=Login
......@@ -1979,6 +2001,7 @@ setup.clearspace.service.uri_error=Enter a valid Clearspace service URI.
setup.clearspace.service.secret=Shared Secret
setup.clearspace.service.secret_help=Shared secret between Clearspace and Openfire.
setup.clearspace.service.secret_error=Enter a valid shared secret as set in Clearspace.
setup.clearspace.service.connection_error=Enter a valid configuration, use the test button for more information.
setup.clearspace.service.advanced=Advanced SSL Settings
setup.clearspace.service.certificate.verify.chain=Verify chain of certificate
setup.clearspace.service.certificate.verify.chain_help=Subject of each certificate is the issuer of the next certificate in the chain
......@@ -1994,6 +2017,16 @@ setup.clearspace.service.certificate.verify.validity_help=Certificate is valid a
setup.clearspace.service.test.error-connection=An error occured while attempting to connect to Clearspace. \
Please check your Clearspace admin console, under the Real-Time tab, and verify that the URI and Shared \
Secret match what you have entered below.
setup.clearspace.service.test.error-authentication=An error occured while attempting to connect to Clearspace. \
Please check that the shared secret is that same that has Clearspace. (Invalid shared secret).
setup.clearspace.service.test.error-pageNotFound=An error occured while attempting to connect to Clearspace. \
Please check that the URI is correct and that points to your Clearspace instance. (Page not found).
setup.clearspace.service.test.error-serviceNotAvaitble=An error occured while attempting to connect to Clearspace. \
Please check Clearspace logs since there was an interal error. (Service not avaible).
setup.clearspace.service.test.error-updateState=An error occured while attempting to connect to Clearspace. \
Clearspace is in an update state. Please go to the Clearspace admin console and finish the update. (Update state).
setup.clearspace.service.test.error-unknownHost=An error occured while attempting to connect to Clearspace. \
Please check that the host is correct and that points to your Clearspace instance. (Unknown host).
setup.clearspace.service.test.close=Close
setup.clearspace.service.test.title=Test
setup.clearspace.service.test.title-desc=Connection Settings
......@@ -2062,6 +2095,12 @@ setup.sidebar.datasource=Database Settings
setup.sidebar.profile=Profile Settings
setup.sidebar.admin=Admin Account
# Prelogin setup sidebar Page
prelogin.setup.sidebar.title.clearspace=Clearspace Integration
prelogin.setup.error.clearspace.sharedsecret=Openfire and Clearspace shared secret doesn't match. Use the test button for more information.
prelogin.setup.error.clearspace.connection=Openfire is not able to connect to that URI. Use the test button for more information.
# SSL settings Page
ssl.settings.title=Security Settings
......
src/i18n/openfire_i18n_es.properties
View file @ 9f725b9a
......@@ -556,8 +556,12 @@ login.title=Consola de Administraci\u00f3n
login.hint=Acceso a la Consola de Administraci\u00f3n
login.error=Error: No tiene JavaScript habilitado. Esta herramienta usa JavaScript y muchas cosas no \
funcionar\u00e1n si no est\u00e1 habilitado. Por favor active JavaScript y recarge esta p\u00e1gina.
login.failed=Error al ingresar: aseg\u00farese de que su nombre de usuario y contrase\u00f1a son correctos y de \
login.failed.unauthorized=Error al ingresar: aseg\u00farese de que su nombre de usuario y contrase\u00f1a son correctos y de \
que es un administrador o un moderador.
login.failed.connection=Login failed: make sure your the user and group system is up and running.
login.failed.connection.clearspace=Clearspace unreachable: make sure Clearspace is up and running or click the login button again to change Openfire configuration.
login.failed.authentication=Login failed: Openfire wasn't able to authenticate itself to the users system.
login.failed.authentication.clearspace=Login failed: Clearspace shared secret is not valid, check Clearspace configuration or click the login button again to change Openfire configuration.
login.username=usuario
login.password=contrase\u00f1a
login.login=Ingresar
......@@ -1473,6 +1477,12 @@ setup.sidebar.datasource=Configuraci\u00f3n de la fuente de datos
setup.sidebar.profile=Configuraci\u00f3n del Perf\u00edl
setup.sidebar.admin=Cuenta de administrador
# Prelogin setup sidebar Page
prelogin.setup.sidebar.title.clearspace=Clearspace Integration
prelogin.setup.error.clearspace.sharedsecret=Openfire and Clearspace shared secret doesn't match. Use the test button for more information.
prelogin.setup.error.clearspace.connection=Openfire is not able to connect to that URI. Use the test button for more information.
# SSL settings Page
ssl.settings.title=Configuraci\u00f3n de seguridad
......@@ -2304,9 +2314,20 @@ setup.clearspace.service.port_error=Ingrese un puerto de Clearspace v\u00e1lido.
setup.clearspace.service.port_help=N\u00famero de puerto de Clearspace. El valor por defecto es 80.
setup.clearspace.service.secret=Secreto Compartido
setup.clearspace.service.secret_error=Ingrese el mismo secreto compartido ingresado en Clearspace.
setup.clearspace.service.connection_error=Enter a valid configuration, use the test button for more information.
setup.clearspace.service.secret_help=Secreto compartido entre Clearspace y Openfire.
setup.clearspace.service.test.close=Cerrar
setup.clearspace.service.test.error-connection=Un error ha occurido al intentar conectarse a Clearspace. Si encuentra este mensaje de error debe reportarlo para ser solucionado.
setup.clearspace.service.test.error-authentication=An error occured while attempting to connect to Clearspace. \
Please check that the shared secret is that same that has Clearspace. (Invalid shared secret).
setup.clearspace.service.test.error-pageNotFound=An error occured while attempting to connect to Clearspace. \
Please check that the URI is correct and that points to your Clearspace instance. (Page not found).
setup.clearspace.service.test.error-serviceNotAvaitble=An error occured while attempting to connect to Clearspace. \
Please check Clearspace logs since there was an interal error. (Service not avaible).
setup.clearspace.service.test.error-updateState=An error occured while attempting to connect to Clearspace. \
Clearspace is in an update state. Please go to the Clearspace admin console and finish the update. (Update state).
setup.clearspace.service.test.error-unknownHost=An error occured while attempting to connect to Clearspace. \
Please check that the host is correct and that points to your Clearspace instance. (Unknown host).
setup.clearspace.service.test.status-error=Estatus: Error
setup.clearspace.service.test.status-success=Estatus: Exitoso!
setup.clearspace.service.test.status-success.detail=Conexi\u00f3n al servicio Clearspace ha sido existosa. Puede cerrar \
......
src/i18n/openfire_i18n_fr.properties
View file @ 9f725b9a
......@@ -477,7 +477,11 @@ log.line = ligne
login.title = Console d'Administration
login.hint = Connexion \u00E0 la Console d'Administration
login.error = Erreur\: JavaScript n'est pas actif. Cet outil utilise JavaScript et une grande partie du site ne marchera pas sans. Veuillez activer JavaScript et recharger cette page.
login.failed = Echec de la Connexion \: Soyez s\u00FBr que le pseudo et le mot de passe sont correctes et que vous soyez administrateur ou mod\u00E9rateur.
login.failed.unauthorized = Echec de la Connexion \: Soyez s\u00FBr que le pseudo et le mot de passe sont correctes et que vous soyez administrateur ou mod\u00E9rateur.
login.failed.connection=Login failed: make sure your the user and group system is up and running.
login.failed.connection.clearspace=Clearspace unreachable: make sure Clearspace is up and running or click the login button again to change Openfire configuration.
login.failed.authentication=Login failed: Openfire wasn't able to authenticate itself to the users system.
login.failed.authentication.clearspace=Login failed: Clearspace shared secret is not valid, check Clearspace configuration or click the login button again to change Openfire configuration.
login.username = pseudo
login.password = mot de passe
login.login = Connexion
......@@ -1179,6 +1183,10 @@ setup.sidebar.settings = Param\u00E8tres du Serveur
setup.sidebar.datasource = Param\u00E8tre de la Base de Donn\u00E9es
setup.sidebar.profile = Param\u00E8tres de Profil
setup.sidebar.admin = Compte Administrateur
# Prelogin setup sidebar Page
prelogin.setup.sidebar.title.clearspace=Clearspace Integration
prelogin.setup.error.clearspace.sharedsecret=Openfire and Clearspace shared secret doesn't match. Use the test button for more information.
prelogin.setup.error.clearspace.connection=Openfire is not able to connect to that URI. Use the test button for more information.
# SSL settings Page
ssl.settings.title = Param\u00E8tres de S\u00E9curit\u00E9
ssl.settings.update = Param\u00E8tres mis \u00E0 jour avec succ\u00E8s.
......@@ -1872,11 +1880,22 @@ setup.clearspace.service.secure=Secure
setup.clearspace.service.secure_help=Disable to use HTTP instead of HTTPS for connection.
setup.clearspace.service.secret=Shared Secret
setup.clearspace.service.secret_error=Enter a valid shared secret as set in Clearspace.
setup.clearspace.service.connection_error=Enter a valid configuration, use the test button for more information.
setup.clearspace.service.secret_help=Shared secret between Clearspace and Openfire.
setup.clearspace.service.test.close=Close
setup.clearspace.service.test.error-connection=An error occured while attempting to connect to Clearspace. \
Please check your Clearspace admin console, under the Real-Time tab, and verify that the URI and Shared \
Secret match what you have entered below.
setup.clearspace.service.test.error-authentication=An error occured while attempting to connect to Clearspace. \
Please check that the shared secret is that same that has Clearspace. (Invalid shared secret).
setup.clearspace.service.test.error-pageNotFound=An error occured while attempting to connect to Clearspace. \
Please check that the URI is correct and that points to your Clearspace instance. (Page not found).
setup.clearspace.service.test.error-serviceNotAvaitble=An error occured while attempting to connect to Clearspace. \
Please check Clearspace logs since there was an interal error. (Service not avaible).
setup.clearspace.service.test.error-updateState=An error occured while attempting to connect to Clearspace. \
Clearspace is in an update state. Please go to the Clearspace admin console and finish the update. (Update state).
setup.clearspace.service.test.error-unknownHost=An error occured while attempting to connect to Clearspace. \
Please check that the host is correct and that points to your Clearspace instance. (Unknown host).
setup.clearspace.service.test.status-error=Status: Error
setup.clearspace.service.test.status-success=Status: Success!
setup.clearspace.service.test.status-success.detail=A connection was successfully established to the Clearspace \
......
src/i18n/openfire_i18n_ja_JP.properties
View file @ 9f725b9a
......@@ -744,8 +744,12 @@ login.title=\u7ba1\u7406\u30b3\u30f3\u30bd\u30fc\u30eb
login.hint=\u7ba1\u7406\u30b3\u30f3\u30bd\u30fc\u30eb\u30ed\u30b0\u30a4\u30f3
login.error=\u30a8\u30e9\u30fc: JavaScript\u304c\u6709\u52b9\u306b\u306a\u3063\u3066\u3044\u307e\u305b\u3093\u3002\u3053\u306e\u30da\u30fc\u30b8\u306fJavaScript\u3092\u591a\u7528\u3057\u307e\u3059\u3002\
\u307e\u305fJavaScript\u304c\u6709\u52b9\u3067\u306a\u3044\u5834\u5408\u306b\u306f\u6b63\u3057\u304f\u52d5\u4f5c\u3057\u307e\u305b\u3093\u3002JavaScript\u3092\u6709\u52b9\u306b\u3057\u3001\u30da\u30fc\u30b8\u3092\u518d\u30ed\u30fc\u30c9\u3057\u3066\u304f\u3060\u3055\u3044\u3002
login.failed=\u30ed\u30b0\u30a4\u30f3\u5931\u6557\u3057\u307e\u3057\u305f\u3002: \u30e6\u30fc\u30b6\u30fc\u540d\u3001\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u6b63\u3057\u3044\u304b\u3001\u305d\u3057\u3066\u30e6\u30fc\u30b6\u30fc\u304c\u7ba1\u7406\u8005\u3001\u3082\u3057\u304f\u306f\u30e2\u30c7\u30ec\u30fc\u30bf\u3067\
login.failed.unauthorized=\u30ed\u30b0\u30a4\u30f3\u5931\u6557\u3057\u307e\u3057\u305f\u3002: \u30e6\u30fc\u30b6\u30fc\u540d\u3001\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u6b63\u3057\u3044\u304b\u3001\u305d\u3057\u3066\u30e6\u30fc\u30b6\u30fc\u304c\u7ba1\u7406\u8005\u3001\u3082\u3057\u304f\u306f\u30e2\u30c7\u30ec\u30fc\u30bf\u3067\
\u3042\u308b\u304b\u3069\u3046\u304b\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002
login.failed.connection=Login failed: make sure your the user and group system is up and running.
login.failed.connection.clearspace=Clearspace unreachable: make sure Clearspace is up and running or click the login button again to change Openfire configuration.
login.failed.authentication=Login failed: Openfire wasn't able to authenticate itself to the users system.
login.failed.authentication.clearspace=Login failed: Clearspace shared secret is not valid, check Clearspace configuration or click the login button again to change Openfire configuration.
login.username=\u30e6\u30fc\u30b6\u30fc\u540d
login.password=\u30d1\u30b9\u30ef\u30fc\u30c9
login.login=\u30ed\u30b0\u30a4\u30f3
......@@ -1653,6 +1657,12 @@ setup.sidebar.datasource=\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u8a2d\u5b9a
setup.sidebar.profile=\u30d7\u30ed\u30d5\u30a1\u30a4\u30eb\u8a2d\u5b9a
setup.sidebar.admin=\u7ba1\u7406\u30a2\u30ab\u30a6\u30f3\u30c8
# Prelogin setup sidebar Page
prelogin.setup.sidebar.title.clearspace=Clearspace Integration
prelogin.setup.error.clearspace.sharedsecret=Openfire and Clearspace shared secret doesn't match. Use the test button for more information.
prelogin.setup.error.clearspace.connection=Openfire is not able to connect to that URI. Use the test button for more information.
# SSL settings Page
ssl.settings.title=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3\u8a2d\u5b9a
......@@ -2397,11 +2407,22 @@ setup.clearspace.service.secure=Secure
setup.clearspace.service.secure_help=Disable to use HTTP instead of HTTPS for connection.
setup.clearspace.service.secret=Shared Secret
setup.clearspace.service.secret_error=Enter a valid shared secret as set in Clearspace.
setup.clearspace.service.connection_error=Enter a valid configuration, use the test button for more information.
setup.clearspace.service.secret_help=Shared secret between Clearspace and Openfire.
setup.clearspace.service.test.close=Close
setup.clearspace.service.test.error-connection=An error occured while attempting to connect to Clearspace. \
Please check your Clearspace admin console, under the Real-Time tab, and verify that the URI and Shared \
Secret match what you have entered below.
setup.clearspace.service.test.error-authentication=An error occured while attempting to connect to Clearspace. \
Please check that the shared secret is that same that has Clearspace. (Invalid shared secret).
setup.clearspace.service.test.error-pageNotFound=An error occured while attempting to connect to Clearspace. \
Please check that the URI is correct and that points to your Clearspace instance. (Page not found).
setup.clearspace.service.test.error-serviceNotAvaitble=An error occured while attempting to connect to Clearspace. \
Please check Clearspace logs since there was an interal error. (Service not avaible).
setup.clearspace.service.test.error-updateState=An error occured while attempting to connect to Clearspace. \
Clearspace is in an update state. Please go to the Clearspace admin console and finish the update. (Update state).
setup.clearspace.service.test.error-unknownHost=An error occured while attempting to connect to Clearspace. \
Please check that the host is correct and that points to your Clearspace instance. (Unknown host).
setup.clearspace.service.test.status-error=Status: Error
setup.clearspace.service.test.status-success=Status: Success!
setup.clearspace.service.test.status-success.detail=A connection was successfully established to the Clearspace \
......
src/i18n/openfire_i18n_nl.properties
View file @ 9f725b9a
......@@ -543,8 +543,12 @@ login.title=Beheerdersconsole
login.hint=Beheerdersconsole aanmelding
login.error=Fout: JavaScript is niet aangeschakelt in uw webbrowser. Dit programma gebruikt JavaScript en grote delen ervan werken \
niet correct zonder JavaScript aan te schakelen. Schakel JavaScript aan en vernieuw deze pagina.
login.failed=Aanmelding mislukt: Controleer dat uw gebruikersnaam en wachtwoord correct zijn en dat u een beheerder \
login.failed.unauthorized=Aanmelding mislukt: Controleer dat uw gebruikersnaam en wachtwoord correct zijn en dat u een beheerder \
of moderator bent.
login.failed.connection=Login failed: make sure your the user and group system is up and running.
login.failed.connection.clearspace=Clearspace unreachable: make sure Clearspace is up and running or click the login button again to change Openfire configuration.
login.failed.authentication=Login failed: Openfire wasn't able to authenticate itself to the users system.
login.failed.authentication.clearspace=Login failed: Clearspace shared secret is not valid, check Clearspace configuration or click the login button again to change Openfire configuration.
login.username=Gebruikersnaam
login.password=Wachtwoord
login.login=Aanmelden
......@@ -2261,11 +2265,22 @@ setup.clearspace.service.secure=Secure
setup.clearspace.service.secure_help=Disable to use HTTP instead of HTTPS for connection.
setup.clearspace.service.secret=Shared Secret
setup.clearspace.service.secret_error=Enter a valid shared secret as set in Clearspace.
setup.clearspace.service.connection_error=Enter a valid configuration, use the test button for more information.
setup.clearspace.service.secret_help=Shared secret between Clearspace and Openfire.
setup.clearspace.service.test.close=Close
setup.clearspace.service.test.error-connection=An error occured while attempting to connect to Clearspace. \
Please check your Clearspace admin console, under the Real-Time tab, and verify that the URI and Shared \
Secret match what you have entered below.
setup.clearspace.service.test.error-authentication=An error occured while attempting to connect to Clearspace. \
Please check that the shared secret is that same that has Clearspace. (Invalid shared secret).
setup.clearspace.service.test.error-pageNotFound=An error occured while attempting to connect to Clearspace. \
Please check that the URI is correct and that points to your Clearspace instance. (Page not found).
setup.clearspace.service.test.error-serviceNotAvaitble=An error occured while attempting to connect to Clearspace. \
Please check Clearspace logs since there was an interal error. (Service not avaible).
setup.clearspace.service.test.error-updateState=An error occured while attempting to connect to Clearspace. \
Clearspace is in an update state. Please go to the Clearspace admin console and finish the update. (Update state).
setup.clearspace.service.test.error-unknownHost=An error occured while attempting to connect to Clearspace. \
Please check that the host is correct and that points to your Clearspace instance. (Unknown host).
setup.clearspace.service.test.status-error=Status: Error
setup.clearspace.service.test.status-success=Status: Success!
setup.clearspace.service.test.status-success.detail=A connection was successfully established to the Clearspace \
......
src/i18n/openfire_i18n_pl_PL.properties
View file @ 9f725b9a
......@@ -547,8 +547,12 @@ login.hint=Logowanie do konsoli administracyjnej
login.error=B\u0142\u0105d: Nie masz w\u0142\u0105czonej obs\u0142ugi JavaScript. To narz\u0119dzie u\u017cywa j\u0119zyka JavaScript i nie b\u0119dzie w pe\u0142ni \
funkcjonowa\u0142o bez w\u0142\u0105czonej jego obs\u0142ugi. Prosz\u0119 w\u0142\u0105czy\u0107 obs\u0142ug\u0119 JavaScript w przegl\u0105darce internetowej \
i ponownie za\u0142adowa\u0107 t\u0119 stron\u0119.
login.failed=B\u0142\u0105d logowania: prosz\u0119 upewni\u0107 si\u0119, \u017ce podana nazwa u\u017cytkownika i has\u0142o s\u0105 prawid\u0142owe oraz \u017ce masz uprawnienia \
login.failed.unauthorized=B\u0142\u0105d logowania: prosz\u0119 upewni\u0107 si\u0119, \u017ce podana nazwa u\u017cytkownika i has\u0142o s\u0105 prawid\u0142owe oraz \u017ce masz uprawnienia \
administratora lub moderatora.
login.failed.connection=Login failed: make sure your the user and group system is up and running.
login.failed.connection.clearspace=Clearspace unreachable: make sure Clearspace is up and running or click the login button again to change Openfire configuration.
login.failed.authentication=Login failed: Openfire wasn't able to authenticate itself to the users system.
login.failed.authentication.clearspace=Login failed: Clearspace shared secret is not valid, check Clearspace configuration or click the login button again to change Openfire configuration.
login.username=nazwa u\u017cytkownika
login.password=has\u0142o
login.login=Zaloguj
......@@ -1403,6 +1407,12 @@ setup.sidebar.settings=Ustawienia serwera
setup.sidebar.datasource=Ustawienia baz danych
setup.sidebar.admin=Konto administratora
# Prelogin setup sidebar Page
prelogin.setup.sidebar.title.clearspace=Clearspace Integration
prelogin.setup.error.clearspace.sharedsecret=Openfire and Clearspace shared secret doesn't match. Use the test button for more information.
prelogin.setup.error.clearspace.connection=Openfire is not able to connect to that URI. Use the test button for more information.
# SSL settings Page
ssl.settings.title=Ustawienia bezpiecze\u0144stwa
......@@ -2230,11 +2240,22 @@ setup.clearspace.service.secure=Secure
setup.clearspace.service.secure_help=Disable to use HTTP instead of HTTPS for connection.
setup.clearspace.service.secret=Shared Secret
setup.clearspace.service.secret_error=Enter a valid shared secret as set in Clearspace.
setup.clearspace.service.connection_error=Enter a valid configuration, use the test button for more information.
setup.clearspace.service.secret_help=Shared secret between Clearspace and Openfire.
setup.clearspace.service.test.close=Close
setup.clearspace.service.test.error-connection=An error occured while attempting to connect to Clearspace. \
Please check your Clearspace admin console, under the Real-Time tab, and verify that the URI and Shared \
Secret match what you have entered below.
setup.clearspace.service.test.error-authentication=An error occured while attempting to connect to Clearspace. \
Please check that the shared secret is that same that has Clearspace. (Invalid shared secret).
setup.clearspace.service.test.error-pageNotFound=An error occured while attempting to connect to Clearspace. \
Please check that the URI is correct and that points to your Clearspace instance. (Page not found).
setup.clearspace.service.test.error-serviceNotAvaitble=An error occured while attempting to connect to Clearspace. \
Please check Clearspace logs since there was an interal error. (Service not avaible).
setup.clearspace.service.test.error-updateState=An error occured while attempting to connect to Clearspace. \
Clearspace is in an update state. Please go to the Clearspace admin console and finish the update. (Update state).
setup.clearspace.service.test.error-unknownHost=An error occured while attempting to connect to Clearspace. \
Please check that the host is correct and that points to your Clearspace instance. (Unknown host).
setup.clearspace.service.test.status-error=Status: Error
setup.clearspace.service.test.status-success=Status: Success!
setup.clearspace.service.test.status-success.detail=A connection was successfully established to the Clearspace \
......
src/i18n/openfire_i18n_pt_BR.properties
View file @ 9f725b9a
......@@ -561,8 +561,12 @@ login.title=Console Admin
login.hint=Login do Console de Administra\u00e7\u00e3o
login.error=Erro: Voc\u00ea n\u00e3o tem JavaScript ativo. Esta ferramenta utiliza JavaScript e a maioria dele n\u00e3o \
funcionar\u00e1 corretamente sem o JavaScript ativado. Por favor ative o JavaScript e atualize esta p\u00e1gina.
login.failed=Login falhou: tenha certeza que seu usu\u00e1rio e senha estejam corretos e que voc\u00ea seja administrador \
login.failed.unauthorized=Login falhou: tenha certeza que seu usu\u00e1rio e senha estejam corretos e que voc\u00ea seja administrador \
ou moderador.
login.failed.connection=Login failed: make sure your the user and group system is up and running.
login.failed.connection.clearspace=Clearspace unreachable: make sure Clearspace is up and running or click the login button again to change Openfire configuration.
login.failed.authentication=Login failed: Openfire wasn't able to authenticate itself to the users system.
login.failed.authentication.clearspace=Login failed: Clearspace shared secret is not valid, check Clearspace configuration or click the login button again to change Openfire configuration.
login.username=Usu\u00e1rio
login.password=Senha
login.version=Vers\u00e3o
......@@ -1484,6 +1488,12 @@ setup.sidebar.admin=Conta do Administrador
# SSL settings Page
# Prelogin setup sidebar Page
prelogin.setup.sidebar.title.clearspace=Clearspace Integration
prelogin.setup.error.clearspace.sharedsecret=Openfire and Clearspace shared secret doesn't match. Use the test button for more information.
prelogin.setup.error.clearspace.connection=Openfire is not able to connect to that URI. Use the test button for more information.
ssl.settings.title=Configura\u00e7\u00f5es de Seguran\u00e7a SSL
ssl.settings.update=Configura\u00e7\u00f5es atualizadas com \u00eaxito.
ssl.settings.client.info=Clientes podem se conectar ao servidor utilizando conex\u00f5es seguras ou n\u00e3o seguras. \
......@@ -2264,11 +2274,22 @@ setup.clearspace.service.secure=Secure
setup.clearspace.service.secure_help=Disable to use HTTP instead of HTTPS for connection.
setup.clearspace.service.secret=Shared Secret
setup.clearspace.service.secret_error=Enter a valid shared secret as set in Clearspace.
setup.clearspace.service.connection_error=Enter a valid configuration, use the test button for more information.
setup.clearspace.service.secret_help=Shared secret between Clearspace and Openfire.
setup.clearspace.service.test.close=Close
setup.clearspace.service.test.error-connection=An error occured while attempting to connect to Clearspace. \
Please check your Clearspace admin console, under the Real-Time tab, and verify that the URI and Shared \
Secret match what you have entered below.
setup.clearspace.service.test.error-authentication=An error occured while attempting to connect to Clearspace. \
Please check that the shared secret is that same that has Clearspace. (Invalid shared secret).
setup.clearspace.service.test.error-pageNotFound=An error occured while attempting to connect to Clearspace. \
Please check that the URI is correct and that points to your Clearspace instance. (Page not found).
setup.clearspace.service.test.error-serviceNotAvaitble=An error occured while attempting to connect to Clearspace. \
Please check Clearspace logs since there was an interal error. (Service not avaible).
setup.clearspace.service.test.error-updateState=An error occured while attempting to connect to Clearspace. \
Clearspace is in an update state. Please go to the Clearspace admin console and finish the update. (Update state).
setup.clearspace.service.test.error-unknownHost=An error occured while attempting to connect to Clearspace. \
Please check that the host is correct and that points to your Clearspace instance. (Unknown host).
setup.clearspace.service.test.status-error=Status: Error
setup.clearspace.service.test.status-success=Status: Success!
setup.clearspace.service.test.status-success.detail=A connection was successfully established to the Clearspace \
......
src/i18n/openfire_i18n_sk.properties
View file @ 9f725b9a
......@@ -901,7 +901,11 @@ log.line=riadok
login.title=Konzola spr\u00E1vcu
login.hint=Prihl\u00E1senie na konzolu spr\u00E1vcu
login.error=Chyba: Nem\u00E1te zapnut\u00FD JavaScript. Tento n\u00E1stroj vyu\u017E\u00EDva JavaScript a jeho ve\u013Ek\u00E1 \u010Das\u0165 nebude pracova\u0165 spr\u00E1vne, ak ho nezapnete. Pros\u00EDm, zapnite JavaScript a znova na\u010D\u00EDtajte t\u00FAto str\u00E1nku.
login.failed=Prihl\u00E1senie sa nepodarilo: uistite sa, \u017Ee ste spr\u00E1vne zadali pou\u017E\u00EDvate\u013Esk\u00E9 meno a heslo a \u017Ee ste spr\u00E1vca alebo moder\u00E1tor.
login.failed.unauthorized=Prihl\u00E1senie sa nepodarilo: uistite sa, \u017Ee ste spr\u00E1vne zadali pou\u017E\u00EDvate\u013Esk\u00E9 meno a heslo a \u017Ee ste spr\u00E1vca alebo moder\u00E1tor.
login.failed.connection=Login failed: make sure your the user and group system is up and running.
login.failed.connection.clearspace=Clearspace unreachable: make sure Clearspace is up and running or click the login button again to change Openfire configuration.
login.failed.authentication=Login failed: Openfire wasn't able to authenticate itself to the users system.
login.failed.authentication.clearspace=Login failed: Clearspace shared secret is not valid, check Clearspace configuration or click the login button again to change Openfire configuration.
login.username=pou\u017E\u00EDvate\u013Esk\u00E9 meno
login.password=heslo
login.login=Prihl\u00E1si\u0165 sa
......@@ -1685,8 +1689,19 @@ setup.clearspace.service.uri_error=Zadajte platn\u00FD URI slu\u017Eby Clearspac
setup.clearspace.service.secret=Zdie\u013Ean\u00E9 heslo
setup.clearspace.service.secret_help=Zdie\u013Ean\u00E9 heslo medzi Clearspace a Openfire.
setup.clearspace.service.secret_error=Zadajte platn\u00E9 zdie\u013Ean\u00E9 heslo ako je nastaven\u00E9 v Clearspace.
setup.clearspace.service.connection_error=Enter a valid configuration, use the test button for more information.
setup.clearspace.service.test.error-connection=Pri pokuse o pripojenie ku Clearspace nastala chyba. Pros\u00EDm, skontrolujte konzolu spr\u00E1vcu Clearspace, z\u00E1lo\u017Eku Real-Time a overte, \u017Ee URI a Zdie\u013Ean\u00E9 heslo sa zhoduj\u00FA s hodnotami, ktor\u00E9 ste zadali tu.
setup.clearspace.service.test.error-authentication=An error occured while attempting to connect to Clearspace. \
Please check that the shared secret is that same that has Clearspace. (Invalid shared secret).
setup.clearspace.service.test.error-pageNotFound=An error occured while attempting to connect to Clearspace. \
Please check that the URI is correct and that points to your Clearspace instance. (Page not found).
setup.clearspace.service.test.error-serviceNotAvaitble=An error occured while attempting to connect to Clearspace. \
Please check Clearspace logs since there was an interal error. (Service not avaible).
setup.clearspace.service.test.error-updateState=An error occured while attempting to connect to Clearspace. \
Clearspace is in an update state. Please go to the Clearspace admin console and finish the update. (Update state).
setup.clearspace.service.test.error-unknownHost=An error occured while attempting to connect to Clearspace. \
Please check that the host is correct and that points to your Clearspace instance. (Unknown host).
setup.clearspace.service.test.close=Zatvori\u0165
setup.clearspace.service.test.title=Test
setup.clearspace.service.test.title-desc=Nastavenia spojenia
......@@ -1747,6 +1762,12 @@ setup.sidebar.datasource=Nastavenia datab\u00E1zy
setup.sidebar.profile=Nastavenia profilu
setup.sidebar.admin=\u00DA\u010Det spr\u00E1vcu
# Prelogin setup sidebar Page
prelogin.setup.sidebar.title.clearspace=Clearspace Integration
prelogin.setup.error.clearspace.sharedsecret=Openfire and Clearspace shared secret doesn't match. Use the test button for more information.
prelogin.setup.error.clearspace.connection=Openfire is not able to connect to that URI. Use the test button for more information.
# SSL settings Page
ssl.settings.title=Bezpe\u010Dnostn\u00E9 nastavenia
......
src/i18n/openfire_i18n_zh_CN.properties
View file @ 9f725b9a
......@@ -538,8 +538,12 @@ log.line=\u884c
login.title=\u7ba1\u7406\u63a7\u5236\u53f0
login.hint=\u7ba1\u7406\u63a7\u5236\u53f0\u767b\u5f55
login.error=\u9519\u8bef\uff1a\u5c1a\u672a\u542f\u7528 JavaScript\u3002\u672c\u5de5\u5177\u4f7f\u7528 JavaScript\uff0c\u5982\u679c\u672a\u542f\u7528\u5b83\uff0c\u5219\u672c\u5de5\u5177\u7684\u5927\u90e8\u5206\u529f\u80fd\u65e0\u6cd5\u4f7f\u7528\u3002\u8bf7\u542f\u7528 JavaScript \u5e76\u91cd\u65b0\u88c5\u5165\u6b64\u9875\u9762\u3002
login.error.unauthorized=\u9519\u8bef\uff1a\u5c1a\u672a\u542f\u7528 JavaScript\u3002\u672c\u5de5\u5177\u4f7f\u7528 JavaScript\uff0c\u5982\u679c\u672a\u542f\u7528\u5b83\uff0c\u5219\u672c\u5de5\u5177\u7684\u5927\u90e8\u5206\u529f\u80fd\u65e0\u6cd5\u4f7f\u7528\u3002\u8bf7\u542f\u7528 JavaScript \u5e76\u91cd\u65b0\u88c5\u5165\u6b64\u9875\u9762\u3002
login.failed=\u767b\u5f55\u5931\u8d25\uff1a\u8bf7\u786e\u4fdd\u60a8\u7684\u7528\u6237\u540d\u548c\u5bc6\u7801\u6b63\u786e\uff0c\u5e76\u4e14\u60a8\u662f\u7ba1\u7406\u5458\u6216\u4e3b\u6301\u8005\u3002
login.failed.connection=Login failed: make sure your the user and group system is up and running.
login.failed.connection.clearspace=Clearspace unreachable: make sure Clearspace is up and running or click the login button again to change Openfire configuration.
login.failed.authentication=Login failed: Openfire wasn't able to authenticate itself to the users system.
login.failed.authentication.clearspace=Login failed: Clearspace shared secret is not valid, check Clearspace configuration or click the login button again to change Openfire configuration.
login.username=\u7528\u6237\u540d
login.password=\u5bc6\u7801
login.login=\u767b\u5f55
......@@ -1331,6 +1335,12 @@ setup.sidebar.datasource=\u6570\u636e\u5e93\u8bbe\u7f6e
setup.sidebar.profile=\u5916\u5f62\u8bbe\u7f6e
setup.sidebar.admin=\u7ba1\u7406\u5458\u5e10\u6237
# Prelogin setup sidebar Page
prelogin.setup.sidebar.title.clearspace=Clearspace Integration
prelogin.setup.error.clearspace.sharedsecret=Openfire and Clearspace shared secret doesn't match. Use the test button for more information.
prelogin.setup.error.clearspace.connection=Openfire is not able to connect to that URI. Use the test button for more information.
# SSL settings Page
ssl.settings.title=SSL \u5b89\u5168\u8bbe\u7f6e
......@@ -2042,11 +2052,22 @@ setup.clearspace.service.secure=Secure
setup.clearspace.service.secure_help=Disable to use HTTP instead of HTTPS for connection.
setup.clearspace.service.secret=Shared Secret
setup.clearspace.service.secret_error=Enter a valid shared secret as set in Clearspace.
setup.clearspace.service.connection_error=Enter a valid configuration, use the test button for more information.
setup.clearspace.service.secret_help=Shared secret between Clearspace and Openfire.
setup.clearspace.service.test.close=Close
setup.clearspace.service.test.error-connection=An error occured while attempting to connect to Clearspace. \
Please check your Clearspace admin console, under the Real-Time tab, and verify that the URI and Shared \
Secret match what you have entered below.
setup.clearspace.service.test.error-authentication=An error occured while attempting to connect to Clearspace. \
Please check that the shared secret is that same that has Clearspace. (Invalid shared secret).
setup.clearspace.service.test.error-pageNotFound=An error occured while attempting to connect to Clearspace. \
Please check that the URI is correct and that points to your Clearspace instance. (Page not found).
setup.clearspace.service.test.error-serviceNotAvaitble=An error occured while attempting to connect to Clearspace. \
Please check Clearspace logs since there was an interal error. (Service not avaible).
setup.clearspace.service.test.error-updateState=An error occured while attempting to connect to Clearspace. \
Clearspace is in an update state. Please go to the Clearspace admin console and finish the update. (Update state).
setup.clearspace.service.test.error-unknownHost=An error occured while attempting to connect to Clearspace. \
Please check that the host is correct and that points to your Clearspace instance. (Unknown host).
setup.clearspace.service.test.status-error=Status: Error
setup.clearspace.service.test.status-success=Status: Success!
setup.clearspace.service.test.status-success.detail=A connection was successfully established to the Clearspace \
......
src/java/org/jivesoftware/openfire/auth/AuthFactory.java
View file @ 9f725b9a
......@@ -150,8 +150,7 @@ public class AuthFactory {
* or the account is locked out.
*/
public static AuthToken authenticate(String username, String password)
throws UnauthorizedException
{
throws UnauthorizedException, ConnectionException, InternalUnauthenticatedException {
if (LockOutManager.getInstance().isAccountDisabled(username)) {
LockOutManager.getInstance().recordFailedLogin(username);
throw new UnauthorizedException();
......@@ -175,8 +174,7 @@ public class AuthFactory {
* existing user or the account is locked out.
*/
public static AuthToken authenticate(String username, String token, String digest)
throws UnauthorizedException
{
throws UnauthorizedException, ConnectionException, InternalUnauthenticatedException {
if (LockOutManager.getInstance().isAccountDisabled(username)) {
LockOutManager.getInstance().recordFailedLogin(username);
throw new UnauthorizedException();
......
src/java/org/jivesoftware/openfire/auth/AuthProvider.java
View file @ 9f725b9a
......@@ -61,8 +61,11 @@ public interface AuthProvider {
* @param password the passwordl
* @throws UnauthorizedException if the username and password do
* not match any existing user.
* @throws ConnectionException it there is a problem connecting to user and group sytem
* @throws InternalUnauthenticatedException if there is a problem authentication Openfire iteself into the user and group system
*/
void authenticate(String username, String password) throws UnauthorizedException;
void authenticate(String username, String password) throws UnauthorizedException,
ConnectionException, InternalUnauthenticatedException;
/**
* Returns if the username, token, and digest are valid; otherwise this
......@@ -77,9 +80,11 @@ public interface AuthProvider {
* @param digest the digest generated from plain-text password and unique token.
* @throws UnauthorizedException if the username and password
* do not match any existing user.
* @throws ConnectionException it there is a problem connecting to user and group sytem
* @throws InternalUnauthenticatedException if there is a problem authentication Openfire iteself into the user and group system
*/
void authenticate(String username, String token, String digest)
throws UnauthorizedException;
throws UnauthorizedException, ConnectionException, InternalUnauthenticatedException;
/**
* Returns the user's password. This method should throw an UnsupportedOperationException
......
src/java/org/jivesoftware/openfire/auth/ConnectionException.java 0 → 100644
View file @ 9f725b9a
/**
* $RCSfile$
* $Revision: 691 $
* $Date: 2004-12-13 15:06:54 -0300 (Mon, 13 Dec 2004) $
*
* Copyright (C) 2004-2008 Jive Software. All rights reserved.
*
* This software is published under the terms of the GNU Public License (GPL),
* a copy of which is included in this distribution, or a commercial license
* agreement with Jive.
*/
package org.jivesoftware.openfire.auth;
/**
* Thrown when Openfire is not able to connect to the user and group system.
*
* @author Gabriel Guardincerri
*/
public class ConnectionException extends Exception {
public ConnectionException() {
super();
}
public ConnectionException(String message) {
super(message);
}
public ConnectionException(String message, Throwable cause) {
super(message, cause);
}
public ConnectionException(Throwable cause) {
super(cause);
}
}
src/java/org/jivesoftware/openfire/auth/HybridAuthProvider.java
View file @ 9f725b9a
......@@ -186,7 +186,7 @@ public class HybridAuthProvider implements AuthProvider {
return false;
}
public void authenticate(String username, String password) throws UnauthorizedException {
public void authenticate(String username, String password) throws UnauthorizedException, ConnectionException, InternalUnauthenticatedException {
// Check overrides first.
if (primaryOverrides.contains(username.toLowerCase())) {
primaryProvider.authenticate(username, password);
......
src/java/org/jivesoftware/openfire/auth/InternalUnauthenticatedException.java 0 → 100644
View file @ 9f725b9a
/**
* $RCSfile$
* $Revision: 691 $
* $Date: 2004-12-13 15:06:54 -0300 (Mon, 13 Dec 2004) $
*
* Copyright (C) 2004-2008 Jive Software. All rights reserved.
*
* This software is published under the terms of the GNU Public License (GPL),
* a copy of which is included in this distribution, or a commercial license
* agreement with Jive.
*/
package org.jivesoftware.openfire.auth;
/**
* Thrown when Openfire is not able to authenticate itself into the user and group system.
*
* @author Gabriel Guardincerri
*/
public class InternalUnauthenticatedException extends Exception {
public InternalUnauthenticatedException() {
super();
}
public InternalUnauthenticatedException(String message) {
super(message);
}
public InternalUnauthenticatedException(String message, Throwable cause) {
super(message, cause);
}
public InternalUnauthenticatedException(Throwable cause) {
super(cause);
}
}
src/java/org/jivesoftware/openfire/clearspace/ClearspaceAdminProvider.java
View file @ 9f725b9a
......@@ -63,7 +63,7 @@ public class ClearspaceAdminProvider implements AdminProvider {
}
return admins;
}
catch (ConnectException e) {
catch (ConnectionException e) {
Log.error(e);
return new ArrayList<JID>();
}
......
src/java/org/jivesoftware/openfire/clearspace/ClearspaceAuthProvider.java
View file @ 9f725b9a
......@@ -12,6 +12,8 @@ package org.jivesoftware.openfire.clearspace;
import org.jivesoftware.openfire.auth.AuthProvider;
import org.jivesoftware.openfire.auth.UnauthorizedException;
import org.jivesoftware.openfire.auth.ConnectionException;
import org.jivesoftware.openfire.auth.InternalUnauthenticatedException;
import static org.jivesoftware.openfire.clearspace.ClearspaceManager.HttpType.GET;
import org.jivesoftware.openfire.net.SASLAuthentication;
import org.jivesoftware.openfire.user.UserNotFoundException;
......@@ -59,7 +61,8 @@ public class ClearspaceAuthProvider implements AuthProvider {
* @param password the password.
* @throws UnauthorizedException if the username of password are incorrect.
*/
public void authenticate(String username, String password) throws UnauthorizedException {
public void authenticate(String username, String password) throws UnauthorizedException,
ConnectionException, InternalUnauthenticatedException {
try {
// Un-escape username.
username = JID.unescapeNode(username);
......@@ -69,6 +72,12 @@ public class ClearspaceAuthProvider implements AuthProvider {
ClearspaceManager.getInstance().executeRequest(GET, path);
} catch (UnauthorizedException ue) {
throw ue;
} catch (org.jivesoftware.openfire.clearspace.ConnectionException e) {
if (e.getErrorType() == org.jivesoftware.openfire.clearspace.ConnectionException.ErrorType.AUTHENTICATION) {
throw new InternalUnauthenticatedException("Bad credentials to use Clearspace webservices", e);
} else {
throw new ConnectionException("Error connection to Clearspace webservices", e);
}
} catch (Exception e) {
// It is not supported exception, wrap it into an UnsupportedOperationException
throw new UnauthorizedException("Unexpected error", e);
......
src/java/org/jivesoftware/openfire/clearspace/ClearspaceManager.java
View file @ 9f725b9a
......@@ -17,14 +17,12 @@ import org.apache.commons.httpclient.auth.AuthScope;
import org.apache.commons.httpclient.methods.*;
import org.apache.commons.httpclient.protocol.Protocol;
import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
import org.apache.mina.transport.socket.nio.SocketAcceptor;
import org.dom4j.*;
import org.dom4j.io.XMPPPacketReader;
import org.jivesoftware.openfire.IQResultListener;
import org.jivesoftware.openfire.IQRouter;
import org.jivesoftware.openfire.XMPPServer;
import org.jivesoftware.openfire.XMPPServerInfo;
import org.jivesoftware.openfire.spi.ConnectionManagerImpl;
import org.jivesoftware.openfire.http.HttpBindManager;
import org.jivesoftware.openfire.auth.AuthFactory;
import org.jivesoftware.openfire.auth.UnauthorizedException;
......@@ -347,7 +345,7 @@ public class ClearspaceManager extends BasicModule implements ExternalComponentM
/**
* Tests the web services connection with Clearspace given the manager's current configuration.
*
* @return True if connection test was successful.
* @return The exception or unll if connection test was successful.
*/
public Throwable testConnection() {
// Test invoking a simple method
......@@ -360,7 +358,7 @@ public class ClearspaceManager extends BasicModule implements ExternalComponentM
} catch (Exception e) {
// It is not ok, return false.
Log.warn("Failed testing communicating with Clearspace" , e);
return e.getCause();
return e;
}
}
......@@ -804,10 +802,10 @@ public class ClearspaceManager extends BasicModule implements ExternalComponentM
* @param type Must be GET or DELETE
* @param urlSuffix The url suffix of the rest request
* @return The response as a xml doc.
* @throws ConnectException Thrown if there are issues perfoming the request.
* @throws ConnectionException Thrown if there are issues perfoming the request.
* @throws Exception Thrown if the response from Clearspace contains an exception.
*/
public Element executeRequest(HttpType type, String urlSuffix) throws ConnectException, Exception {
public Element executeRequest(HttpType type, String urlSuffix) throws ConnectionException, Exception {
assert (type == HttpType.GET || type == HttpType.DELETE);
return executeRequest(type, urlSuffix, null);
}
......@@ -822,11 +820,11 @@ public class ClearspaceManager extends BasicModule implements ExternalComponentM
* @param urlSuffix The url suffix of the rest request
* @param xmlParams The xml with the request params, must be null if type is GET or DELETE only
* @return The response as a xml doc.
* @throws ConnectException Thrown if there are issues perfoming the request.
* @throws ConnectionException Thrown if there are issues perfoming the request.
* @throws Exception Thrown if the response from Clearspace contains an exception.
*/
public Element executeRequest(HttpType type, String urlSuffix, String xmlParams)
throws ConnectException, Exception {
throws ConnectionException, Exception {
if (Log.isDebugEnabled()) {
Log.debug("Outgoing REST call [" + type + "] to " + urlSuffix + ": " + xmlParams);
}
......@@ -883,9 +881,27 @@ public class ClearspaceManager extends BasicModule implements ExternalComponentM
// Checks the http status
if (method.getStatusCode() != 200) {
throw new ConnectException(
"Error connecting to Clearspace, http status code: " + method.getStatusCode(),
new HTTPConnectionException(method.getStatusCode()));
if (method.getStatusCode() == 401) {
throw new ConnectionException(
"Invalid password to connect to Clearspace.", ConnectionException.ErrorType.AUTHENTICATION);
}
else if (method.getStatusCode() == 404) {
throw new ConnectionException(
"Web service not found in Clearspace.", ConnectionException.ErrorType.PAGE_NOT_FOUND);
}
else if (method.getStatusCode() == 503) {
throw new ConnectionException(
"Web service not avaible in Clearspace.", ConnectionException.ErrorType.SERVICE_NOT_AVAIBLE);
}
else {
throw new ConnectionException(
"Error connecting to Clearspace, http status code: " + method.getStatusCode(),
new HTTPConnectionException(method.getStatusCode()), ConnectionException.ErrorType.OTHER);
}
} else if (body.contains("Clearspace Upgrade Console")) {
//TODO Change CS to send a more standard error message
throw new ConnectionException(
"Clearspace is in an update state.", ConnectionException.ErrorType.UPDATE_STATE);
}
Element response = localParser.get().parseDocument(body).getRootElement();
......@@ -896,11 +912,13 @@ public class ClearspaceManager extends BasicModule implements ExternalComponentM
// Since there is no exception, returns the response
return response;
} catch (DocumentException e) {
throw new ConnectException("Error parsing the response of Clearspace.", e);
throw new ConnectionException("Error parsing the response of Clearspace.", e, ConnectionException.ErrorType.OTHER);
} catch (HttpException e) {
throw new ConnectException("Error peforming http request to Clearspace", e);
throw new ConnectionException("Error performing http request to Clearspace", e, ConnectionException.ErrorType.OTHER);
} catch (UnknownHostException e) {
throw new ConnectionException("Unknown Host " + getConnectionURI() + " trying to connect to Clearspace", e, ConnectionException.ErrorType.UNKNOWN_HOST);
} catch (IOException e) {
throw new ConnectException("Error peforming http request to Clearspace.", e);
throw new ConnectionException("Error peforming http request to Clearspace.", e, ConnectionException.ErrorType.OTHER);
} finally {
method.releaseConnection();
}
......
src/java/org/jivesoftware/openfire/clearspace/ConnectException.java deleted 100644 → 0
View file @ eb81e336
package org.jivesoftware.openfire.clearspace;
/**
* Thrown when an exception occurs connecting to CS.
*/
public class ConnectException extends Exception {
public ConnectException(String s, Throwable throwable) {
super(s, throwable);
}
public ConnectException(Throwable throwable) {
super(throwable);
}
}
src/java/org/jivesoftware/openfire/clearspace/ConnectionException.java 0 → 100644
View file @ 9f725b9a
/**
* $RCSfile$
* $Revision: 691 $
* $Date: 2004-12-13 15:06:54 -0300 (Mon, 13 Dec 2004) $
*
* Copyright (C) 2004-2008 Jive Software. All rights reserved.
*
* This software is published under the terms of the GNU Public License (GPL),
* a copy of which is included in this distribution, or a commercial license
* agreement with Jive.
*/
package org.jivesoftware.openfire.clearspace;
/**
* Thrown when an exception occurs connecting to CS.
*/
public class ConnectionException extends Exception {
public enum ErrorType {AUTHENTICATION, PAGE_NOT_FOUND, UPDATE_STATE, UNKNOWN_HOST, SERVICE_NOT_AVAIBLE, OTHER};
private ErrorType errorType;
public ConnectionException(String s, Throwable throwable, ErrorType errorType) {
super(s, throwable);
this.errorType = errorType;
}
public ConnectionException(String s, ErrorType errorType) {
super(s);
this.errorType = errorType;
}
public ConnectionException(Throwable throwable, ErrorType errorType) {
super(throwable);
this.errorType = errorType;
}
public ErrorType getErrorType() {
return errorType;
}
}
src/java/org/jivesoftware/openfire/commands/admin/user/AuthenticateUser.java
View file @ 9f725b9a
......@@ -15,6 +15,8 @@ import org.dom4j.Element;
import org.jivesoftware.openfire.XMPPServer;
import org.jivesoftware.openfire.auth.AuthFactory;
import org.jivesoftware.openfire.auth.UnauthorizedException;
import org.jivesoftware.openfire.auth.ConnectionException;
import org.jivesoftware.openfire.auth.InternalUnauthenticatedException;
import org.jivesoftware.openfire.commands.AdHocCommand;
import org.jivesoftware.openfire.commands.SessionData;
import org.jivesoftware.openfire.component.InternalComponentManager;
......@@ -89,6 +91,16 @@ public class AuthenticateUser extends AdHocCommand {
note.addAttribute("type", "error");
note.setText("Authentication failed.");
return;
} catch (ConnectionException e) {
// Auth failed
note.addAttribute("type", "error");
note.setText("Authentication failed.");
return;
} catch (InternalUnauthenticatedException e) {
// Auth failed
note.addAttribute("type", "error");
note.setText("Authentication failed.");
return;
}
// Answer that the operation was successful
note.addAttribute("type", "info");
......
src/java/org/jivesoftware/openfire/handler/IQAuthHandler.java
View file @ 9f725b9a
......@@ -16,9 +16,7 @@ import org.dom4j.DocumentHelper;
import org.dom4j.Element;
import org.dom4j.QName;
import org.jivesoftware.openfire.*;
import org.jivesoftware.openfire.auth.AuthFactory;
import org.jivesoftware.openfire.auth.AuthToken;
import org.jivesoftware.openfire.auth.UnauthorizedException;
import org.jivesoftware.openfire.auth.*;
import org.jivesoftware.openfire.event.SessionEventDispatcher;
import org.jivesoftware.openfire.session.ClientSession;
import org.jivesoftware.openfire.session.LocalClientSession;
......@@ -160,6 +158,14 @@ public class IQAuthHandler extends IQHandler implements IQAuthInfo {
response = IQ.createResultIQ(packet);
response.setChildElement(packet.getChildElement().createCopy());
response.setError(PacketError.Condition.not_authorized);
} catch (ConnectionException e) {
response = IQ.createResultIQ(packet);
response.setChildElement(packet.getChildElement().createCopy());
response.setError(PacketError.Condition.internal_server_error);
} catch (InternalUnauthenticatedException e) {
response = IQ.createResultIQ(packet);
response.setChildElement(packet.getChildElement().createCopy());
response.setError(PacketError.Condition.internal_server_error);
}
}
else {
......@@ -179,7 +185,7 @@ public class IQAuthHandler extends IQHandler implements IQAuthInfo {
}
private IQ login(String username, Element iq, IQ packet, String password, LocalClientSession session, String digest)
throws UnauthorizedException, UserNotFoundException {
throws UnauthorizedException, UserNotFoundException, ConnectionException, InternalUnauthenticatedException {
// Verify that specified resource is not violating any string prep rule
String resource = iq.elementTextTrim("resource");
if (resource != null) {
......
src/java/org/jivesoftware/openfire/net/XMPPCallbackHandler.java
View file @ 9f725b9a
......@@ -87,7 +87,7 @@ public class XMPPCallbackHandler implements CallbackHandler {
AuthToken at = AuthFactory.authenticate(name, new String(vpcb.getPassword()));
vpcb.setVerified((at != null));
}
catch (UnauthorizedException e) {
catch (Exception e) {
vpcb.setVerified(false);
}
}
......
src/web/WEB-INF/web.xml
View file @ 9f725b9a
......@@ -24,7 +24,7 @@
<init-param>
<param-name>excludes</param-name>
<param-value>
login.jsp,index.jsp?logout=true,setup/index.jsp,setup/setup-,.gif,.png,error-serverdown.jsp
login.jsp,index.jsp?logout=true,setup/index.jsp,setup/setup-,.gif,.png,error-serverdown.jsp,setup/clearspace-integration-prelogin.jsp
</param-value>
</init-param>
</filter>
......
src/web/clearspace-integration.jsp
View file @ 9f725b9a
<%
boolean initialSetup = false;
boolean forceTest = false;
String currentPage = "clearspace-integration.jsp";
String testPage = "setup/setup-clearspace-integration_test.jsp";
String nextPage = "profile-settings.jsp";
......
src/web/decorators/setup.jsp
View file @ 9f725b9a
......@@ -37,6 +37,14 @@
int currentStep = decoratedPage.getIntProperty("meta.currentStep");
%>
<%
String preloginSidebar = (String) session.getAttribute("prelogin.setup.sidebar");
if (preloginSidebar == null) {
preloginSidebar = "false";
}
boolean showPreloginSidebar = Boolean.parseBoolean(preloginSidebar);
%>
<%!
final PropertyDescriptor getPropertyDescriptor(PropertyDescriptor[] pd, String name) {
for (PropertyDescriptor aPd : pd) {
......@@ -144,24 +152,37 @@
<!-- BEGIN jive-sidebar -->
<div id="jive-sidebar">
<% if (showSidebar) {
String[] names = {
LocaleUtils.getLocalizedString("setup.sidebar.language"),
LocaleUtils.getLocalizedString("setup.sidebar.settings"),
LocaleUtils.getLocalizedString("setup.sidebar.datasource"),
LocaleUtils.getLocalizedString("setup.sidebar.profile"),
LocaleUtils.getLocalizedString("setup.sidebar.admin")
String[] names;
String[] links;
if (showPreloginSidebar) {
names = new String[] {
LocaleUtils.getLocalizedString((String) session.getAttribute("prelogin.setup.sidebar.title"))
};
String[] links = {
"index.jsp",
"setup-host-settings.jsp",
"setup-datasource-settings.jsp",
"setup-profile-settings.jsp",
"setup-admin-settings.jsp"
links = new String[] {
(String) session.getAttribute("prelogin.setup.sidebar.link")
};
} else {
names = new String[] {
LocaleUtils.getLocalizedString("setup.sidebar.language"),
LocaleUtils.getLocalizedString("setup.sidebar.settings"),
LocaleUtils.getLocalizedString("setup.sidebar.datasource"),
LocaleUtils.getLocalizedString("setup.sidebar.profile"),
LocaleUtils.getLocalizedString("setup.sidebar.admin")
};
links = new String[] {
"index.jsp",
"setup-host-settings.jsp",
"setup-datasource-settings.jsp",
"setup-profile-settings.jsp",
"setup-admin-settings.jsp"
};
}
%>
<ul id="jive-sidebar-progress">
<% if (!showPreloginSidebar) { %>
<li class="category"><fmt:message key="setup.sidebar.title" /></li>
<li><img src="../images/setup_sidebar_progress<%= currentStep %>.gif" alt="" width="142" height="13" border="0"></li>
<% } %>
<% for (int i=0; i<names.length; i++) { %>
<% if (currentStep < i) { %>
<li><a href="<%= links[i] %>"><%= names[i] %></a></li>
......
src/web/login.jsp
View file @ 9f725b9a
......@@ -5,20 +5,17 @@
--%>
<%@ page import="org.jivesoftware.admin.AdminConsole,
org.jivesoftware.openfire.admin.AdminManager,
org.jivesoftware.openfire.auth.AuthFactory,
org.jivesoftware.openfire.auth.AuthToken"
org.jivesoftware.openfire.admin.AdminManager"
errorPage="error.jsp"
%>
<%@ page import="org.jivesoftware.openfire.auth.UnauthorizedException"%>
<%@ page import="org.jivesoftware.openfire.clearspace.ClearspaceManager"%>
<%@ page import="org.jivesoftware.openfire.cluster.ClusterManager" %>
<%@ page import="org.jivesoftware.openfire.container.AdminConsolePlugin" %>
<%@ page import="org.jivesoftware.util.Base64" %>
<%@ page import="org.jivesoftware.util.Log" %>
<%@ page import="org.jivesoftware.util.ParamUtils" %>
<%@ page import="org.jivesoftware.util.StringUtils" %>
<%@ page import="org.xmpp.packet.JID" %>
<%@ page import="org.jivesoftware.openfire.auth.*" %>
<%@ page import="java.util.HashMap" %>
<%@ page import="java.util.Map" %>
<%@ page import="org.jivesoftware.util.*" %>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
......@@ -68,7 +65,7 @@
// Check the request/response for a login token
boolean errors = false;
Map<String, String> errors = new HashMap<String, String>();
if (ParamUtils.getBooleanParameter(request, "login")) {
try {
......@@ -99,9 +96,45 @@
response.sendRedirect(go(url));
return;
}
catch (ConnectionException ue) {
Log.debug(ue);
if (ClearspaceManager.isEnabled()) {
if (session.getAttribute("prelogin.setup.error.firstTime.connection") != null) {
session.removeAttribute("prelogin.setup.error.firstTime.connection");
session.setAttribute("prelogin.setup.error", "prelogin.setup.error.clearspace.connection");
session.setAttribute("prelogin.setup.sidebar", "true");
session.setAttribute("prelogin.setup.sidebar.title", "prelogin.setup.sidebar.title.clearspace");
session.setAttribute("prelogin.setup.sidebar.link", "clearspace-integration-prelogin.jsp");
response.sendRedirect(go("setup/clearspace-integration-prelogin.jsp"));
} else {
session.setAttribute("prelogin.setup.error.firstTime.connection", true);
errors.put("connection", LocaleUtils.getLocalizedString("login.failed.connection.clearspace"));
}
} else {
errors.put("connection", LocaleUtils.getLocalizedString("login.failed.connection"));
}
}
catch (InternalUnauthenticatedException ue) {
Log.debug(ue);
if (ClearspaceManager.isEnabled()) {
if (session.getAttribute("prelogin.setup.error.firstTime.sharedsecret") != null) {
session.removeAttribute("prelogin.setup.error.firstTime.sharedsecret");
session.setAttribute("prelogin.setup.error", "prelogin.setup.error.clearspace.sharedsecret");
session.setAttribute("prelogin.setup.sidebar", "true");
session.setAttribute("prelogin.setup.sidebar.title", "prelogin.setup.sidebar.title.clearspace");
session.setAttribute("prelogin.setup.sidebar.link", "clearspace-integration-prelogin.jsp");
response.sendRedirect(go("setup/clearspace-integration-prelogin.jsp"));
} else {
session.setAttribute("prelogin.setup.error.firstTime.sharedsecret", true);
errors.put("authentication", LocaleUtils.getLocalizedString("login.failed.authentication.clearspace"));
}
} else {
errors.put("authentication", LocaleUtils.getLocalizedString("login.failed.authentication"));
}
}
catch (UnauthorizedException ue) {
Log.debug(ue);
errors = true;
errors.put("unauthorized", LocaleUtils.getLocalizedString("login.failed.unauthorized"));
}
}
%>
......@@ -174,14 +207,16 @@
</td>
</tr>
</noscript>
<% if (errors) { %>
<% if (errors.size() > 0) { %>
<tr>
<td colspan="3">
<table cellpadding="0" cellspacing="0" border="0">
<% for (String error:errors.values()) { %>
<tr valign="top">
<td><img src="images/error-16x16.gif" width="16" height="16" border="0" alt="" vspace="2"></td>
<td><div class="jive-error-text" style="padding-left:5px; color:#cc0000;"><fmt:message key="login.failed" /></div></td>
<td><div class="jive-error-text" style="padding-left:5px; color:#cc0000;"><%= error%></div></td>
</tr>
<% } %>
</table>
</td>
</tr>
......
src/web/setup/clearspace-integration-prelogin.jsp 0 → 100644
View file @ 9f725b9a
<%
boolean initialSetup = false;
boolean forceTest = true;
String currentPage = "clearspace-integration-prelogin.jsp";
String testPage = "setup-clearspace-integration_test.jsp";
String nextPage = "../login.jsp";
Map<String, String> meta = new HashMap<String, String>();
meta.put("pageID", "profile-settings");
%>
<style type="text/css" title="setupStyle" media="screen">
@import "../style/lightbox.css";
@import "../style/ldap.css";
</style>
<script language="JavaScript" type="text/javascript" src="../js/prototype.js/prototype.js"></script>
<script language="JavaScript" type="text/javascript" src="../js/scriptaculous.js/scriptaculous.js"></script>
<script language="JavaScript" type="text/javascript" src="../js/lightbox.js/lightbox.js"></script>
<script language="javascript" type="text/javascript" src="../js/tooltips/domLib.js/tooltips/domLib.js"></script>
<script language="javascript" type="text/javascript" src="../js/tooltips/domTT.js/tooltips/domTT.js"></script>
<script language="javascript" type="text/javascript" src="../js/setup.js/setup.js"></script>
<%@ include file="clearspace-integration.jspf" %>
\ No newline at end of file
src/web/setup/clearspace-integration.jspf
View file @ 9f725b9a
......@@ -3,12 +3,15 @@
<%@ page import="java.util.*" %>
<%@ page import="org.jivesoftware.openfire.clearspace.ClearspaceManager" %>
<%@ page import="org.jivesoftware.util.JiveGlobals" %>
<%@ page import="org.jivesoftware.util.StringUtils" %>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
<%
String uri;
String sharedSecret;
String existingHashSharedSecret = "";
String plainSharedSecret = null;
boolean verifyChain = JiveGlobals.getBooleanProperty("clearspace.certificate.verify.chain", true);
boolean verifyRoot = JiveGlobals.getBooleanProperty("clearspace.certificate.verify.root", true);
......@@ -33,14 +36,48 @@
}
Map<String, String> errors = new HashMap<String, String>();
// If we came from a prelogin error, show it and remove it from the session
String preloginError = (String) session.getAttribute("prelogin.setup.error");
if (preloginError != null) {
errors.put("prelogin", LocaleUtils.getLocalizedString(preloginError));
session.removeAttribute("prelogin.setup.error");
}
if (save || test) {
uri = ParamUtils.getParameter(request, "uri");
if (uri == null) {
errors.put("uri", LocaleUtils.getLocalizedString("setup.clearspace.service.uri_error"));
}
// this could be the new entered plain shared secret or the current hashed shared secret
sharedSecret = ParamUtils.getParameter(request, "sharedSecret");
// this will store new entered plain shared secret or the current plain shared secret
//String plainSharedSecret = null;
if (sharedSecret == null || sharedSecret.length() == 0) {
errors.put("secret", LocaleUtils.getLocalizedString("setup.clearspace.service.secret_error"));
} else {
// set to the current plain shared secret
plainSharedSecret = manager.getSharedSecret();
// Hash the current shared secret
if (plainSharedSecret != null) {
existingHashSharedSecret = StringUtils.hash(plainSharedSecret);
System.out.println("2- existingHashSharedSecret: " + existingHashSharedSecret);
}
// Check if the new shared secret was changed. If it wasn't changed, then it is the original hashed shared secret
// NOTE: if the new PLAIN password equals the previous HASHED password this fails, but is unlikely.
if (!existingHashSharedSecret.equals(sharedSecret)) {
// Hash the new shared secret since it was changed
String newHashSharedSecret = "";
if (sharedSecret != null) {
newHashSharedSecret = StringUtils.hash(sharedSecret);
}
// Change password if their hash values are different
if (!existingHashSharedSecret.equals(newHashSharedSecret)) {
plainSharedSecret = sharedSecret;
}
}
}
verifyChain = ParamUtils.getBooleanParameter(request, "verifyChain", verifyChain);
......@@ -49,22 +86,40 @@
verifyIdentity = ParamUtils.getBooleanParameter(request, "verifyIdentity", verifyIdentity);
verifyValidity = ParamUtils.getBooleanParameter(request, "verifyValidity", verifyValidity);
Map<String, String> settings = new HashMap<String, String>();
// If there are no errors check if there is a need to run a force test
if (errors.isEmpty()) {
// Store settings in a map and keep it in the session
Map<String, String> settings = new HashMap<String, String>();
settings.put("clearspace.uri", uri);
settings.put("clearspace.sharedSecret", sharedSecret);
// Sets the current shared secret, it will be changed if the new shared secret is different
settings.put("clearspace.sharedSecret", plainSharedSecret);
settings.put("clearspace.certificate.verify.chain", Boolean.toString(verifyChain));
settings.put("clearspace.certificate.verify.root", Boolean.toString(verifyRoot));
settings.put("clearspace.certificate.accept-selfsigned", Boolean.toString(selfSigned));
settings.put("clearspace.certificate.verify.identity", Boolean.toString(verifyIdentity));
settings.put("clearspace.certificate.verify.validity", Boolean.toString(verifyValidity));
if (save && forceTest) {
ClearspaceManager managerTest = new ClearspaceManager(settings);
if (managerTest.testConnection() != null) {
// if there is any problems don't save it
// add an error (this is the reason of why this check is in another "if errors.isEmpty()"
errors.put("connection", LocaleUtils.getLocalizedString("setup.clearspace.service.connection_error"));
}
}
}
if (errors.isEmpty()) {
session.setAttribute("clearspaceSettings", settings);
if (save) {
// Save settings and redirect
manager.setConnectionURI(uri);
manager.setSharedSecret(sharedSecret);
manager.setSharedSecret(plainSharedSecret);
System.out.println("6- plainSharedSecret: " + plainSharedSecret);
// Enable the Clearspace auth, user, group, vcard, lockout, security audit, and admin providers.
JiveGlobals.setProperty("provider.auth.className",
......@@ -106,7 +161,7 @@
xmppSettings.put("provider.admin.className",
"org.jivesoftware.openfire.clearspace.ClearspaceAdminProvider");
xmppSettings.put("clearspace.uri", uri);
xmppSettings.put("clearspace.sharedSecret", sharedSecret);
xmppSettings.put("clearspace.sharedSecret", plainSharedSecret);
xmppSettings.put("clearspace.certificate.verify.chain", Boolean.toString(verifyChain));
xmppSettings.put("clearspace.certificate.verify.root", Boolean.toString(verifyRoot));
xmppSettings.put("clearspace.certificate.accept-selfsigned", Boolean.toString(selfSigned));
......@@ -126,7 +181,7 @@
} else {
// See if there are already values for the variables defined.
uri = manager.getConnectionURI();
sharedSecret = manager.getSharedSecret();
sharedSecret = manager.getSharedSecret() == null || manager.getSharedSecret().trim().length() == 0 ? "" : StringUtils.hash(manager.getSharedSecret());
}
%>
<html>
......@@ -196,12 +251,12 @@
</td>
</tr>
<tr>
<td align="right" width="1%" nowrap="nowrap"><fmt:message key="setup.clearspace.service.secret" />:</td>
<td align="right" width="1%" nowrap="nowrap"><fmt:message key="setup.clearspace.service.secret" /> <%=plainSharedSecret%>:</td>
<td colspan="3">
<table cellpadding="0" cellspacing="0" border="0" width="100%">
<tr>
<td width="1%" nowrap="nowrap">
<input type="password" name="sharedSecret" id="jiveCLEARSPACEsecret" size="22" maxlength="30" value="<%= sharedSecret!=null?sharedSecret:""%>">
<input type="password" name="sharedSecret" id="jiveCLEARSPACEsecret" size="22" maxlength="35" value="<%= (sharedSecret != null) ? sharedSecret : "" %>">
</td>
<td width="99%">
<span class="jive-setup-helpicon" onmouseover="domTT_activate(this, event, 'content', '<fmt:message key="setup.clearspace.service.secret_help" />', 'styleClass', 'jiveTooltip', 'trail', true, 'delay', 300, 'lifetime', -1);"></span>
......
src/web/setup/setup-clearspace-integration.jsp
View file @ 9f725b9a
......@@ -9,6 +9,7 @@
<%
boolean initialSetup = true;
boolean forceTest = false;
String currentPage = "setup-clearspace-integration.jsp";
String testPage = "setup-clearspace-integration_test.jsp";
String nextPage = "setup-finished.jsp";
......
src/web/setup/setup-clearspace-integration_test.jsp
View file @ 9f725b9a
......@@ -3,6 +3,7 @@
<%@ page import="org.jivesoftware.openfire.clearspace.ClearspaceManager" %>
<%@ page import="java.net.UnknownHostException" %>
<%@ page import="javax.net.ssl.SSLException" %>
<%@ page import="org.jivesoftware.openfire.clearspace.ConnectionException" %>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt" %>
......@@ -20,11 +21,40 @@
success = true;
}
else {
errorDetail = LocaleUtils.getLocalizedString("setup.clearspace.service.test.error-connection");
if (exception instanceof UnknownHostException) {
exceptionDetail = exception.toString();
if (exception instanceof ConnectionException) {
ConnectionException connException = (ConnectionException) exception;
switch (connException.getErrorType()) {
case AUTHENTICATION:
errorDetail = LocaleUtils.getLocalizedString("setup.clearspace.service.test.error-authentication");
break;
case PAGE_NOT_FOUND:
errorDetail = LocaleUtils.getLocalizedString("setup.clearspace.service.test.error-pageNotFound");
break;
case SERVICE_NOT_AVAIBLE:
errorDetail = LocaleUtils.getLocalizedString("setup.clearspace.service.test.error-serviceNotAvaitble");
break;
case UPDATE_STATE:
errorDetail = LocaleUtils.getLocalizedString("setup.clearspace.service.test.error-updateState");
break;
case UNKNOWN_HOST:
errorDetail = LocaleUtils.getLocalizedString("setup.clearspace.service.test.error-unknownHost");
break;
case OTHER:
errorDetail = LocaleUtils.getLocalizedString("setup.clearspace.service.test.error-connection");
break;
}
} else {
errorDetail = LocaleUtils.getLocalizedString("setup.clearspace.service.test.error-connection");
}
else {
if (exception.getCause() != null) {
if (exception.getCause() instanceof UnknownHostException) {
exceptionDetail = exception.toString();
}
else {
exceptionDetail = exception.getCause().getMessage();
}
} else {
exceptionDetail = exception.getMessage();
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023