Skip to content

bug(personalization): visitor accrues tags for urlmapped page #33621

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+35 −1
Open

bug(personalization): visitor accrues tags for urlmapped page #33621

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 35 additions & 1 deletion dotCMS/src/main/java/com/dotcms/rendering/velocity/servlet/VelocityLiveMode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import com.dotcms.rendering.velocity.util.VelocityUtil;
import com.dotcms.security.ContentSecurityPolicyUtil;
import com.dotcms.vanityurl.model.CachedVanityUrl;
import com.dotcms.visitor.domain.Visitor;
import com.dotmarketing.beans.Host;
import com.dotmarketing.beans.Identifier;
import com.dotmarketing.business.APILocator;
Expand All @@ -24,6 +25,7 @@
import com.dotmarketing.portlets.rules.business.RulesEngine;
import com.dotmarketing.portlets.rules.model.Rule;
import com.dotmarketing.portlets.templates.model.TemplateVersionInfo;
import com.dotmarketing.tag.model.Tag;
import com.dotmarketing.util.Config;
import com.dotmarketing.util.Logger;
import com.dotmarketing.util.PageMode;
Expand All @@ -40,11 +42,14 @@
import java.io.Writer;
import java.nio.charset.StandardCharsets;
import java.util.Date;
import java.util.List;
import java.util.Optional;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;
import javax.servlet.RequestDispatcher;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.NotNull;
import org.apache.commons.io.output.TeeOutputStream;
import org.apache.velocity.context.Context;

Expand Down Expand Up @@ -139,7 +144,7 @@ public final void serve(final OutputStream out) throws DotDataException, IOExcep


addHeaders(htmlPage);

processUrlMapTags(request);
if (!VelocityUtil.shouldPageCache(request, htmlPage)) {
try (Writer tmpOut = new OutputStreamWriter(out)) {
writePage(tmpOut, htmlPage);
Expand Down Expand Up @@ -295,5 +300,34 @@ private void validateTemplate(IHTMLPage htmlPage) {

}

private void processUrlMapTags(@NotNull HttpServletRequest request) {
if (!Config.getBooleanProperty("ACCRUE_TAGS_IN_URLMAPS", true)) {
return;
}
if (request.getAttribute(WebKeys.WIKI_CONTENTLET_INODE) == null) {
return;
}
Optional<Visitor> visitor = visitorAPI.getVisitor(request, false);
if (visitor.isEmpty()) {
return;
}

String inode = (String) request.getAttribute(WebKeys.WIKI_CONTENTLET_INODE);

List<Tag> contentTags = Try.of(() -> APILocator.getTagAPI().getTagsByInode(inode))
.onFailure(e -> Logger.warnAndDebug(VelocityLiveMode.class,
"unable to read tags for inode:" + inode + " : " + e.getMessage(), e))
.getOrElse(List.of());
for (Tag tag : contentTags) {
visitor.get().addTag(tag.getTagName());
}
}








}