diff --git a/distribution/Dockerfile b/distribution/Dockerfile
index bac83127..db3f3267 100644
--- a/distribution/Dockerfile
+++ b/distribution/Dockerfile
@@ -10,7 +10,7 @@ ARG WEBAPP_TARGET_DIR="/usr/local/tomcat/webapps/ROOT"
ARG DB_BASE_DIR="/var/lib/wisemapping"
# Defautl ENV configurations ...
-ENV JAVA_OPTS="-XX:+PrintFlagsFinal -XX:InitialRAMPercentage=30 -XX:MaxRAMPercentage=80"
+ENV JAVA_OPTS="-XX:+PrintFlagsFinal -XX:InitialRAMPercentage=30 -XX:MaxRAMPercentage=80 -javaagent:/opt/newrelic/newrelic.jar"
ENV database.base.url=${DB_BASE_DIR}
# Copy wisemapping distribution ...
diff --git a/wise-ui/pom.xml b/wise-ui/pom.xml
index b9fa0b63..d827f222 100644
--- a/wise-ui/pom.xml
+++ b/wise-ui/pom.xml
@@ -29,11 +29,11 @@
-
+
-
+
@@ -42,11 +42,11 @@
-
+
-
+
diff --git a/wise-webapp/pom.xml b/wise-webapp/pom.xml
index c64e66c9..334bf342 100644
--- a/wise-webapp/pom.xml
+++ b/wise-webapp/pom.xml
@@ -12,25 +12,10 @@
5.0.4
-
-
- maven2-repository.dev.java.net
- Java.net Repository for Maven
- http://download.java.net/maven/2/
- default
-
-
- maven2-repository.jahia.org
- Jahia Repository for Maven
- http://maven.jahia.org/maven2/
- default
-
-
-
5.3.14
5.3.5.RELEASE
- 5.6.3.Final
+ 5.6.5.Final
6.0.21.Final
@@ -205,7 +190,7 @@
mysql
mysql-connector-java
- 8.0.27
+ 8.0.28
runtime
@@ -213,12 +198,6 @@
commons-dbcp2
2.9.0
-
- commons-fileupload
- commons-fileupload
- 1.2.1
- runtime
-
org.hibernate
hibernate-ehcache
@@ -240,6 +219,12 @@
1.2.17
compile
+
+
+ commons-validator
+ commons-validator
+ 1.7
+
org.hsqldb
@@ -250,7 +235,7 @@
com.fasterxml.jackson.core
jackson-databind
- 2.11.3
+ 2.13.1
javax.servlet
@@ -277,7 +262,7 @@
org.apache.httpcomponents
fluent-hc
- 4.5.5
+ 4.5.13
junit
diff --git a/wise-webapp/src/main/java/com/wisemapping/dao/UserManagerImpl.java b/wise-webapp/src/main/java/com/wisemapping/dao/UserManagerImpl.java
index 1729aea8..6aaacb12 100644
--- a/wise-webapp/src/main/java/com/wisemapping/dao/UserManagerImpl.java
+++ b/wise-webapp/src/main/java/com/wisemapping/dao/UserManagerImpl.java
@@ -102,22 +102,28 @@ public class UserManagerImpl
}
@Override
- public User createUser(@NotNull User user, @NotNull Collaborator col) {
- user.setPassword(passwordEncoder.encode(user.getPassword()));
- assert user != null : "Trying to store a null user";
+ public User createUser(@NotNull User user, @NotNull Collaborator collaborator) {
+ this.createUser(user);
- final Set set = col.getCollaborations();
- for (Collaboration collaboration : set) {
- Collaboration newMapUser = new Collaboration();
- newMapUser.setRoleId(collaboration.getRole().ordinal());
- newMapUser.setMindMap(collaboration.getMindMap());
- newMapUser.setCollaborator(user);
- user.addCollaboration(newMapUser);
+ // Migrate from previous temporal collab to new user ...
+ final Set collaborations = collaborator.getCollaborations();
+ for (Collaboration oldCollab : collaborations) {
+ Collaboration newCollab = new Collaboration();
+ newCollab.setRoleId(oldCollab.getRole().ordinal());
+ newCollab.setMindMap(oldCollab.getMindMap());
+ newCollab.setCollaborator(user);
+ user.addCollaboration(newCollab);
+ getHibernateTemplate().save(newCollab);
+
+ // Delete collaborations on this collaborator ...
+ getHibernateTemplate().delete(oldCollab);
}
- getHibernateTemplate().delete(col);
+ // Delete collaboration ...
+ getHibernateTemplate().delete(collaborator);
getHibernateTemplate().flush();
getHibernateTemplate().saveOrUpdate(user);
+
return user;
}
@@ -136,8 +142,7 @@ public class UserManagerImpl
// Does the password need to be encrypted ?
final String password = user.getPassword();
- if(password!=null && (!password.startsWith(LegacyPasswordEncoder.ENC_PREFIX) && !password.startsWith( "{"+ DefaultPasswordEncoderFactories.ENCODING_ID)))
- {
+ if (password != null && (!password.startsWith(LegacyPasswordEncoder.ENC_PREFIX) && !password.startsWith("{" + DefaultPasswordEncoderFactories.ENCODING_ID))) {
user.setPassword(passwordEncoder.encode(user.getPassword()));
}
@@ -152,7 +157,7 @@ public class UserManagerImpl
query.setParameter("activationCode", code);
final List users = query.list();
- if(users != null && !users.isEmpty()) {
+ if (users != null && !users.isEmpty()) {
assert users.size() == 1 : "More than one user with the same username!";
user = (User) users.get(0);
diff --git a/wise-webapp/src/main/java/com/wisemapping/mail/Mailer.java b/wise-webapp/src/main/java/com/wisemapping/mail/Mailer.java
index 6891642c..348da0ca 100644
--- a/wise-webapp/src/main/java/com/wisemapping/mail/Mailer.java
+++ b/wise-webapp/src/main/java/com/wisemapping/mail/Mailer.java
@@ -41,7 +41,7 @@ public final class Mailer {
//~ Methods ..............................................................................................
- public Mailer(@NotNull String siteEmail, @NotNull String supportEmail,@NotNull String errorReporterEmail) {
+ public Mailer(@NotNull String siteEmail, @NotNull String supportEmail, @NotNull String errorReporterEmail) {
this.serverFromEmail = siteEmail;
this.supportEmail = supportEmail;
this.errorReporterEmail = errorReporterEmail;
@@ -51,7 +51,7 @@ public final class Mailer {
return serverFromEmail;
}
- public void sendEmail(final String from, final String to, final String subject, final Map model,
+ public void sendEmail(final String from, final String to, final String subject, final Map model,
@NotNull final String templateMail) {
final MimeMessagePreparator preparator =
new MimeMessagePreparator() {
diff --git a/wise-webapp/src/main/java/com/wisemapping/mail/NotificationService.java b/wise-webapp/src/main/java/com/wisemapping/mail/NotificationService.java
index 30a1932d..ea86ee65 100644
--- a/wise-webapp/src/main/java/com/wisemapping/mail/NotificationService.java
+++ b/wise-webapp/src/main/java/com/wisemapping/mail/NotificationService.java
@@ -22,6 +22,7 @@ import com.wisemapping.filter.SupportedUserAgent;
import com.wisemapping.model.Collaboration;
import com.wisemapping.model.Mindmap;
import com.wisemapping.model.User;
+import com.wisemapping.rest.model.RestLogItem;
import com.wisemapping.util.VelocityEngineUtils;
import com.wisemapping.util.VelocityEngineWrapper;
import org.apache.commons.io.IOUtils;
@@ -140,7 +141,7 @@ final public class NotificationService {
public void activateAccount(@NotNull User user) {
- final Map model = new HashMap<>();
+ final Map model = new HashMap<>();
model.put("user", user);
mailer.sendEmail(mailer.getServerSenderEmail(), user.getEmail(), "[WiseMapping] Active account", model, "activationAccountMail.vm");
}
@@ -163,19 +164,24 @@ final public class NotificationService {
this.velocityEngineWrapper = engine;
}
- public void reportJavascriptException(@Nullable Mindmap mindmap, @Nullable User user, @Nullable String jsErrorMsg, @NotNull HttpServletRequest request) {
+ public void reportJavascriptException(@Nullable Mindmap mindmap, @Nullable User user, @NotNull RestLogItem errorItem, @NotNull HttpServletRequest request) {
- final Map model = new HashMap<>();
- model.put("errorMsg", jsErrorMsg);
+ final Map summary = new HashMap<>();
+ summary.put("JS-MSG", errorItem.getJsErrorMsg());
+ summary.put("JS-STACK", errorItem.getJsStack());
+
+ String mindmapXML = "";
try {
- model.put("mapXML", StringEscapeUtils.escapeXml(mindmap == null ? "map not found" : mindmap.getXmlStr()));
+ mindmapXML = StringEscapeUtils.escapeXml(mindmap == null ? "map not found" : mindmap.getXmlStr());
} catch (UnsupportedEncodingException e) {
// Ignore ...
}
- model.put("mapId", Integer.toString(mindmap.getId()));
- model.put("mapTitle", mindmap.getTitle());
+ summary.put("mapId", Integer.toString(mindmap.getId()));
+ summary.put("mapTitle", mindmap.getTitle());
- logError(model, user, request);
+ logError(summary, user, request);
+ logger.error("Unexpected editor mindmap => " + mindmapXML);
+ logger.error("Unexpected editor JS Stack => " + errorItem.getJsErrorMsg() + "-" + errorItem.getJsStack());
}
private void logError(@NotNull Map model, @Nullable User user, @NotNull HttpServletRequest request) {
@@ -193,7 +199,7 @@ final public class NotificationService {
.map(key -> key + "=" + model.get(key))
.collect(Collectors.joining(", ", "{", "}"));
- logger.error("Unexpected editor error => " + errorAsString);
+ logger.error("Unexpected editor info => " + errorAsString);
}
public void reportJavaException(@NotNull Throwable exception, @Nullable User user, @NotNull HttpServletRequest request) {
diff --git a/wise-webapp/src/main/java/com/wisemapping/model/Collaboration.java b/wise-webapp/src/main/java/com/wisemapping/model/Collaboration.java
index 79a06344..81c690b9 100644
--- a/wise-webapp/src/main/java/com/wisemapping/model/Collaboration.java
+++ b/wise-webapp/src/main/java/com/wisemapping/model/Collaboration.java
@@ -1,24 +1,27 @@
/*
-* Copyright [2015] [wisemapping]
-*
-* Licensed under WiseMapping Public License, Version 1.0 (the "License").
-* It is basically the Apache License, Version 2.0 (the "License") plus the
-* "powered by wisemapping" text requirement on every single page;
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the license at
-*
-* http://www.wisemapping.org/license
-*
-* 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.
-*/
+ * Copyright [2015] [wisemapping]
+ *
+ * Licensed under WiseMapping Public License, Version 1.0 (the "License").
+ * It is basically the Apache License, Version 2.0 (the "License") plus the
+ * "powered by wisemapping" text requirement on every single page;
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the license at
+ *
+ * http://www.wisemapping.org/license
+ *
+ * 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 com.wisemapping.model;
+import org.hibernate.annotations.OnDelete;
+import org.hibernate.annotations.OnDeleteAction;
+
import javax.persistence.*;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
@@ -29,22 +32,23 @@ public class Collaboration implements Serializable {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
- private int id;;
+ private int id;
+ ;
- @Column(name = "role_id",unique = true,nullable = true)
+ @Column(name = "role_id", unique = true)
private CollaborationRole role;
@ManyToOne
- @JoinColumn(name="mindmap_id",nullable = false)
+ @JoinColumn(name = "mindmap_id", nullable = false)
private Mindmap mindMap;
@ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name="colaborator_id",nullable = false)
+ @JoinColumn(name = "colaborator_id", nullable = false)
private Collaborator collaborator;
@ManyToOne(cascade = CascadeType.ALL)
- @JoinColumn(name="properties_id",nullable = false, unique = true)
- private CollaborationProperties collaborationProperties = new CollaborationProperties();;
+ @JoinColumn(name = "properties_id", nullable = false, unique = true)
+ private CollaborationProperties collaborationProperties = new CollaborationProperties();
public Collaboration() {
}
@@ -129,10 +133,9 @@ public class Collaboration implements Serializable {
@Override
public int hashCode() {
- int result = (int) (id ^ (id >>> 32));
+ int result = id ^ (id >>> 32);
result = 31 * result + (role != null ? role.hashCode() : 0);
result = 31 * result + (mindMap != null ? mindMap.hashCode() : 0);
- result = 31 * result + (collaborator != null ? collaborator.hashCode() : 0);
return result;
}
}
diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/AccountController.java b/wise-webapp/src/main/java/com/wisemapping/rest/AccountController.java
index e396ac18..1cb040be 100644
--- a/wise-webapp/src/main/java/com/wisemapping/rest/AccountController.java
+++ b/wise-webapp/src/main/java/com/wisemapping/rest/AccountController.java
@@ -55,8 +55,6 @@ public class AccountController extends BaseController {
@Autowired
private NotificationService notificationService;
- final Logger logger = Logger.getLogger(AccountController.class);
-
@RequestMapping(method = RequestMethod.PUT, value = "account/password", consumes = {"text/plain"})
@ResponseStatus(value = HttpStatus.NO_CONTENT)
@@ -133,8 +131,8 @@ public class AccountController extends BaseController {
public void logError(@RequestBody RestLogItem item, @NotNull HttpServletRequest request) {
final Mindmap mindmap = mindmapService.findMindmapById(item.getMapId());
final User user = Utils.getUser();
- logger.error("Unexpected editor error - " + item.getJsErrorMsg());
- notificationService.reportJavascriptException(mindmap, user, item.getJsErrorMsg() + "\n" + item.getJsStack(), request);
+
+ notificationService.reportJavascriptException(mindmap, user, item, request);
}
}
diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java b/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java
index 65e7a05e..dd918e93 100644
--- a/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java
+++ b/wise-webapp/src/main/java/com/wisemapping/rest/MindmapController.java
@@ -27,6 +27,7 @@ import com.wisemapping.rest.model.*;
import com.wisemapping.security.Utils;
import com.wisemapping.service.*;
import com.wisemapping.validator.MapInfoValidator;
+import org.apache.commons.validator.routines.EmailValidator;
import org.apache.log4j.Logger;
import org.jetbrains.annotations.NotNull;
import org.springframework.beans.factory.annotation.Autowired;
@@ -296,7 +297,14 @@ public class MindmapController extends BaseController {
// Compare one by one if some of the elements has been changed ....
final Set collabsToRemove = new HashSet<>(mindMap.getCollaborations());
for (RestCollaboration restCollab : restCollabs.getCollaborations()) {
- final Collaboration collaboration = mindMap.findCollaboration(restCollab.getEmail());
+ final String email = restCollab.getEmail();
+
+ // Is a valid email address ?
+ if (!EmailValidator.getInstance().isValid(email)) {
+ throw new IllegalArgumentException(email + " is not valid email address");
+ }
+
+ final Collaboration collaboration = mindMap.findCollaboration(email);
// Validate role format ...
String roleStr = restCollab.getRole();
if (roleStr == null) {
@@ -333,6 +341,17 @@ public class MindmapController extends BaseController {
throw new IllegalArgumentException("No enough permissions");
}
+ // Is valid email address ?
+ final EmailValidator emailValidator = EmailValidator.getInstance();
+ restCollabs
+ .getCollaborations()
+ .forEach(collab -> {
+ // Is a valid email address ?
+ if (!emailValidator.isValid(collab.getEmail())) {
+ throw new IllegalArgumentException(collab.getEmail() + " is not valid email address");
+ }
+ });
+
// Has any role changed ?. Just removed it.
final Map mapsByEmail = mindMap
.getCollaborations()
@@ -432,6 +451,12 @@ public class MindmapController extends BaseController {
public void deleteCollabByEmail(@PathVariable int id, @RequestParam(required = false) String email) throws IOException, WiseMappingException {
logger.debug("Deleting permission for email:" + email);
+ // Is a valid email address ?
+ final EmailValidator emailValidator = EmailValidator.getInstance();
+ if (!emailValidator.isValid(email)) {
+ throw new IllegalArgumentException(email + " is not valid email address");
+ }
+
final Mindmap mindmap = findMindmapById(id);
final User user = Utils.getUser();
@@ -495,6 +520,7 @@ public class MindmapController extends BaseController {
mindmapService.removeMindmap(mindmap, user);
}
}
+
@RequestMapping(method = RequestMethod.POST, value = "/maps", consumes = {"application/xml", "application/json"})
@ResponseStatus(value = HttpStatus.CREATED)
public void createMap(@RequestBody(required = false) String mapXml, @NotNull HttpServletResponse response, @RequestParam(required = false) String title, @RequestParam(required = false) String description) throws IOException, WiseMappingException {
@@ -506,7 +532,7 @@ public class MindmapController extends BaseController {
if (description != null && !description.isEmpty()) {
mindmap.setDescription(description);
- }else {
+ } else {
mindmap.setDescription("description");
}
diff --git a/wise-webapp/src/main/java/com/wisemapping/rest/UserController.java b/wise-webapp/src/main/java/com/wisemapping/rest/UserController.java
index 4332ce2e..3f69e152 100644
--- a/wise-webapp/src/main/java/com/wisemapping/rest/UserController.java
+++ b/wise-webapp/src/main/java/com/wisemapping/rest/UserController.java
@@ -58,7 +58,7 @@ public class UserController extends BaseController {
@RequestMapping(method = RequestMethod.POST, value = "/users", produces = {"application/json", "application/xml"})
@ResponseStatus(value = HttpStatus.CREATED)
public void registerUser(@RequestBody RestUserRegistration registration, @NotNull HttpServletRequest request, @NotNull HttpServletResponse response) throws WiseMappingException, BindException {
- logger.info("Register new user:" + registration.getEmail());
+ logger.debug("Register new user:" + registration.getEmail());
// If tomcat is behind a reverse proxy, ip needs to be found in other header.
String remoteIp = request.getHeader(REAL_IP_ADDRESS_HEADER);
diff --git a/wise-webapp/src/main/java/com/wisemapping/service/MindmapServiceImpl.java b/wise-webapp/src/main/java/com/wisemapping/service/MindmapServiceImpl.java
index 3dd0d9ad..09a0ac23 100755
--- a/wise-webapp/src/main/java/com/wisemapping/service/MindmapServiceImpl.java
+++ b/wise-webapp/src/main/java/com/wisemapping/service/MindmapServiceImpl.java
@@ -156,7 +156,7 @@ public class MindmapServiceImpl
@Override
public void removeMindmap(@NotNull Mindmap mindmap, @NotNull User user) throws WiseMappingException {
- if (mindmap.getCreator().identityEquality(user) || isAdmin(user)) {
+ if (mindmap.getCreator().identityEquality(user)) {
mindmapManager.removeMindmap(mindmap);
} else {
final Optional collaboration = mindmap.findCollaboration(user);
diff --git a/wise-webapp/src/main/java/com/wisemapping/service/RecaptchaService.java b/wise-webapp/src/main/java/com/wisemapping/service/RecaptchaService.java
index 041a5384..91ba8406 100644
--- a/wise-webapp/src/main/java/com/wisemapping/service/RecaptchaService.java
+++ b/wise-webapp/src/main/java/com/wisemapping/service/RecaptchaService.java
@@ -1,6 +1,7 @@
package com.wisemapping.service;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.wisemapping.validator.Messages;
import org.apache.commons.lang.StringUtils;
import org.apache.http.NameValuePair;
import org.apache.http.client.fluent.Form;
@@ -22,6 +23,8 @@ public class RecaptchaService {
"https://www.google.com/recaptcha/api/siteverify";
private final static ObjectMapper objectMapper = new ObjectMapper();
+ public static final String CATCH_ERROR_CODE_TIMEOUT_OR_DUPLICATE = "timeout-or-duplicate";
+ public static final String CATCHA_ERROR_CODE_INPUT_RESPONSE = "invalid-input-response";
private String recaptchaSecret;
@Nullable
@@ -48,12 +51,21 @@ public class RecaptchaService {
.asBytes();
final Map responseBody = objectMapper.readValue(body, HashMap.class);
- logger.warn("Response from recaptcha after parse: " + responseBody);
+ logger.debug("Response from recaptcha after parse: " + responseBody);
final Boolean success = (Boolean) responseBody.get("success");
- if (success!=null && !success) {
+ if (success != null && !success) {
final List errorCodes = (List) responseBody.get("error-codes");
- result = RecaptchaUtil.codeToDescription(errorCodes.get(0));
+ String errorCode = errorCodes.get(0);
+ if (errorCode.equals(CATCH_ERROR_CODE_TIMEOUT_OR_DUPLICATE)) {
+ result = Messages.CAPTCHA_TIMEOUT_OUT_DUPLICATE;
+
+ } else if (errorCode.equals("invalid-input-response")) {
+ result = Messages.CAPTCHA_INVALID_INPUT_RESPONSE;
+ } else {
+ result = Messages.CAPTCHA_LOADING_ERROR;
+ logger.error("Unexpected error during catch resolution:" + errorCodes);
+ }
}
} catch (IOException e) {
logger.error(e.getMessage(), e);
@@ -68,30 +80,4 @@ public class RecaptchaService {
public void setRecaptchaSecret(String recaptchaSecret) {
this.recaptchaSecret = recaptchaSecret;
}
-}
-
-class RecaptchaUtil {
-
- private static final Map
- RECAPTCHA_ERROR_CODE = new HashMap<>();
-
- static String codeToDescription(final String code)
- {
- return RECAPTCHA_ERROR_CODE.getOrDefault(code,"Unexpected error validating code. Please, refresh the page and try again.");
- }
-
- static {
- RECAPTCHA_ERROR_CODE.put("missing-input-secret",
- "The secret parameter is missing");
- RECAPTCHA_ERROR_CODE.put("invalid-input-secret",
- "The secret parameter is invalid or malformed");
- RECAPTCHA_ERROR_CODE.put("missing-input-response",
- "The response parameter is missing");
- RECAPTCHA_ERROR_CODE.put("invalid-input-response",
- "The response parameter is invalid or malformed");
- RECAPTCHA_ERROR_CODE.put("bad-request",
- "The request is invalid or malformed");
- RECAPTCHA_ERROR_CODE.put("timeout-or-duplicate",
- "Please, refresh the page and try again.");
- }
}
\ No newline at end of file
diff --git a/wise-webapp/src/main/java/com/wisemapping/service/UserServiceImpl.java b/wise-webapp/src/main/java/com/wisemapping/service/UserServiceImpl.java
index ad17c2b9..b55a2a69 100755
--- a/wise-webapp/src/main/java/com/wisemapping/service/UserServiceImpl.java
+++ b/wise-webapp/src/main/java/com/wisemapping/service/UserServiceImpl.java
@@ -119,13 +119,11 @@ public class UserServiceImpl
if (emailConfirmEnabled) {
user.setActivationDate(null);
-
} else {
user.setActivationDate(Calendar.getInstance());
}
- Collaborator col = userManager.getCollaboratorBy(user.getEmail());
-
+ final Collaborator col = userManager.getCollaboratorBy(user.getEmail());
if (col != null) {
userManager.createUser(user, col);
} else {
diff --git a/wise-webapp/src/main/java/com/wisemapping/validator/Messages.java b/wise-webapp/src/main/java/com/wisemapping/validator/Messages.java
index 043eb172..ac28ad7e 100644
--- a/wise-webapp/src/main/java/com/wisemapping/validator/Messages.java
+++ b/wise-webapp/src/main/java/com/wisemapping/validator/Messages.java
@@ -26,4 +26,7 @@ public interface Messages {
String LABEL_TITLE_ALREADY_EXISTS = "LABEL_TITLE_ALREADY_EXISTS";
String PASSWORD_MISMATCH = "PASSWORD_MISMATCH";
String CAPTCHA_LOADING_ERROR = "CAPTCHA_LOADING_ERROR";
+
+ String CAPTCHA_TIMEOUT_OUT_DUPLICATE = "CAPTCHA_TIMEOUT_OUT_DUPLICATE";
+ String CAPTCHA_INVALID_INPUT_RESPONSE = "CAPTCHA_INVALID_INPUT_RESPONSE";
}
diff --git a/wise-webapp/src/main/java/com/wisemapping/webmvc/PublicPagesController.java b/wise-webapp/src/main/java/com/wisemapping/webmvc/PublicPagesController.java
index 55e8048f..f65cb811 100644
--- a/wise-webapp/src/main/java/com/wisemapping/webmvc/PublicPagesController.java
+++ b/wise-webapp/src/main/java/com/wisemapping/webmvc/PublicPagesController.java
@@ -18,32 +18,14 @@
package com.wisemapping.webmvc;
-import com.wisemapping.service.MindmapService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.servlet.ModelAndView;
@Controller
public class PublicPagesController {
- @Qualifier("mindmapService")
- @Autowired
- private MindmapService mindmapService;
-
- @RequestMapping(value = "keyboard")
- public String newsPage() {
- return "keyboard";
- }
@RequestMapping(value = "home")
public String home() {
return "homepage";
}
-
- @RequestMapping(value = "iframeWrapper")
- public ModelAndView showIframePage(@RequestParam(required = true) String url) {
- return new ModelAndView("iframeWrapper", "url", url);
- }
}
diff --git a/wise-webapp/src/main/resources/messages_de.properties b/wise-webapp/src/main/resources/messages_de.properties
index a28e1cb1..e45cf2f1 100644
--- a/wise-webapp/src/main/resources/messages_de.properties
+++ b/wise-webapp/src/main/resources/messages_de.properties
@@ -48,4 +48,6 @@ MINDMAP_IS_LOCKED = Mindmap ist für die Bearbeitung gesperrt.
# Confirmed
RESET_PASSWORD_INVALID_EMAIL = Die angegebene E-Mail-Adresse ist kein gültiges Benutzerkonto. Bitte versuchen Sie es erneut mit einer gültigen E-Mail-Adresse.
TRY_WELCOME = Dieser Ausgabebereich zeigt einige der Mindmap-Editor-Funktionen \!.
-UNEXPECTED_ERROR_DETAILS = Unerwarteter Fehler bei der Verarbeitung der Anforderung.
\ No newline at end of file
+UNEXPECTED_ERROR_DETAILS = Unerwarteter Fehler bei der Verarbeitung der Anforderung.
+NO_ENOUGH_PERMISSIONS=Diese map ist nicht mehr verfügbar.
+NO_ENOUGH_PERMISSIONS_DETAILS=Sie haben nicht die erforderlichen Rechte, um sich diese map anzusehen. Diese map ist entweder privat oder wurde gelöscht.
diff --git a/wise-webapp/src/main/resources/messages_en.properties b/wise-webapp/src/main/resources/messages_en.properties
index e433a59e..99bfe252 100644
--- a/wise-webapp/src/main/resources/messages_en.properties
+++ b/wise-webapp/src/main/resources/messages_en.properties
@@ -48,4 +48,8 @@ MINDMAP_IS_LOCKED = Mindmap is locked for edition.
# Confirmed
RESET_PASSWORD_INVALID_EMAIL = The email provided is not a valid user account. Please, try again with a valid email.
TRY_WELCOME = This edition space showcases some of the mindmap editor capabilities \!.
-UNEXPECTED_ERROR_DETAILS = Unexpected error processing request.
\ No newline at end of file
+UNEXPECTED_ERROR_DETAILS = Unexpected error processing request.
+NO_ENOUGH_PERMISSIONS=This mind map can opened.
+NO_ENOUGH_PERMISSIONS_DETAILS=You do not have enough right access to see this map. This map has been changed to private or deleted.
+CAPTCHA_TIMEOUT_OUT_DUPLICATE=Please, refresh the page and try again.
+CAPTCHA_INVALID_INPUT_RESPONSE="Invalid input response, refresh the page and try again.
\ No newline at end of file
diff --git a/wise-webapp/src/main/resources/messages_es.properties b/wise-webapp/src/main/resources/messages_es.properties
index df2ba5db..bc69547d 100644
--- a/wise-webapp/src/main/resources/messages_es.properties
+++ b/wise-webapp/src/main/resources/messages_es.properties
@@ -48,4 +48,7 @@ MINDMAP_IS_LOCKED = Mindmap está bloqueado para la edición.
# Confirmed
RESET_PASSWORD_INVALID_EMAIL = El correo electrónico proporcionado no es una cuenta de usuario válida. Por favor, intente nuevamente con un correo electrónico válido.
TRY_WELCOME = ¡Este espacio de edición muestra algunas de las capacidades del editor de mapas mentales\!.
-UNEXPECTED_ERROR_DETAILS = Error inesperado procesando tu pedido.
\ No newline at end of file
+UNEXPECTED_ERROR_DETAILS = Error inesperado procesando tu pedido.
+NO_ENOUGH_PERMISSIONS=El mapa buscado no se encuentra disponible.
+NO_ENOUGH_PERMISSIONS_DETAILS=No tiene suficiente permisos de acceso para ver este mapa. El mapa no es mas publico o ha sido borrado.
+
diff --git a/wise-webapp/src/main/resources/messages_fr.properties b/wise-webapp/src/main/resources/messages_fr.properties
index 3eb317da..9882ffea 100644
--- a/wise-webapp/src/main/resources/messages_fr.properties
+++ b/wise-webapp/src/main/resources/messages_fr.properties
@@ -48,4 +48,6 @@ MINDMAP_IS_LOCKED = Mindmap est verrouillé pour l'édition.
# Confirmed
RESET_PASSWORD_INVALID_EMAIL = L'e-mail fourni n'est pas un compte d'utilisateur valide. Veuillez réessayer avec un e-mail valide.
TRY_WELCOME = Cet espace d'édition présente certaines des fonctionnalités de l'éditeur de cartes mentales \!.
-UNEXPECTED_ERROR_DETAILS = Erreur inattendue lors du traitement de la demande.
\ No newline at end of file
+UNEXPECTED_ERROR_DETAILS = Erreur inattendue lors du traitement de la demande.
+NO_ENOUGH_PERMISSIONS=Cette carte n'est plus accessible.
+NO_ENOUGH_PERMISSIONS_DETAILS=Vous n'avez pas les droits d'accès suffisants pour voir cette carte. Cette carte est devenue privée, ou a été détruite.
diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml
index 8db06e2d..25accb2f 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml
+++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml
@@ -8,6 +8,13 @@
http://www.springframework.org/schema/security
http://www.springframework.org/schema/security/spring-security.xsd">
+
+
+
+
+
+
+
diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml
index 073c65bb..62da4794 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml
+++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml
@@ -64,12 +64,6 @@
class="org.springframework.web.servlet.i18n.SessionLocaleResolver">
-
-
-
-
-
diff --git a/wise-webapp/src/main/webapp/ads.txt b/wise-webapp/src/main/webapp/ads.txt
new file mode 100644
index 00000000..63aef506
--- /dev/null
+++ b/wise-webapp/src/main/webapp/ads.txt
@@ -0,0 +1 @@
+google.com, pub-4996113942657337, DIRECT, f08c47fec0942fa0
\ No newline at end of file
diff --git a/wise-webapp/src/main/webapp/jsp/googleAnalytics.jsf b/wise-webapp/src/main/webapp/jsp/googleAnalytics.jsf
index 81230068..2161cee1 100644
--- a/wise-webapp/src/main/webapp/jsp/googleAnalytics.jsf
+++ b/wise-webapp/src/main/webapp/jsp/googleAnalytics.jsf
@@ -1,13 +1,16 @@
<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
-
-
-
+
+
+
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
index 95a67fec..89cea8d6 100644
--- a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
@@ -46,7 +46,6 @@
var accountEmail = '${principal.email}';
var mapTitle = '${mindmap.title}';
- <%@ include file="/jsp/googleAnalytics.jsf" %>
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapEditorToolbar.jsf b/wise-webapp/src/main/webapp/jsp/mindmapEditorToolbar.jsf
deleted file mode 100644
index e2e4af0e..00000000
--- a/wise-webapp/src/main/webapp/jsp/mindmapEditorToolbar.jsf
+++ /dev/null
@@ -1,95 +0,0 @@
-<%--@elvariable id="mindmap" type="com.wisemapping.model.Mindmap"--%>
-
-
\ No newline at end of file
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapViewonly.jsp b/wise-webapp/src/main/webapp/jsp/mindmapViewonly.jsp
index 214a9efd..4ab9866c 100644
--- a/wise-webapp/src/main/webapp/jsp/mindmapViewonly.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapViewonly.jsp
@@ -52,8 +52,9 @@
+
- <%@ include file="/jsp/googleAnalytics.jsf" %>
-
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
-