// HTTP
initWebServer(conf);
-// ServiceReference<ExtendedHttpService> sr = bc.getServiceReference(ExtendedHttpService.class);
-// if (sr != null)
-// addHttpService(sr);
-// else
-// log.warn("No http service found");
+ // ServiceReference<ExtendedHttpService> sr =
+ // bc.getServiceReference(ExtendedHttpService.class);
+ // if (sr != null)
+ // addHttpService(sr);
+ // else
+ // log.warn("No http service found");
// Initialise services
initTransactionManager();
Object httpPort = sr.getProperty("http.port");
Object httpsPort = sr.getProperty("https.port");
dataHttp = new DataHttp(httpService);
- nodeHttp = new NodeHttp(httpService, repository);
+ nodeHttp = new NodeHttp(httpService, bc);
if (log.isDebugEnabled())
log.debug(httpPortsMsg(httpPort, httpsPort));
}
import java.security.PrivilegedExceptionAction;
import java.security.cert.X509Certificate;
import java.util.Calendar;
+import java.util.Collection;
import java.util.Enumeration;
import javax.jcr.Node;
import org.argeo.jcr.ArgeoJcrConstants;
import org.argeo.jcr.JcrUtils;
import org.eclipse.equinox.http.servlet.ExtendedHttpService;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
/**
* Intercepts and enriches http access, mainly focusing on security and
// private final DoSFilter dosFilter;
// private final QoSFilter qosFilter;
- private Repository repository;
+ private BundleContext bc;
- NodeHttp(ExtendedHttpService httpService, Repository node) {
- this.repository = node;
+ NodeHttp(ExtendedHttpService httpService, BundleContext bc) {
+ this.bc = bc;
// rootFilter = new RootFilter();
// dosFilter = new CustomDosFilter();
// qosFilter = new QoSFilter();
try {
- httpService.registerServlet("/!", new LinkServlet(repository), null, null);
+ httpService.registerServlet("/!", new LinkServlet(), null, null);
httpService.registerServlet("/robots.txt", new RobotServlet(), null, null);
} catch (Exception e) {
throw new CmsException("Cannot register filters", e);
public void destroy() {
}
- static class LinkServlet extends HttpServlet {
+ class LinkServlet extends HttpServlet {
private static final long serialVersionUID = 3749990143146845708L;
- private final Repository repository;
-
- public LinkServlet(Repository repository) {
- this.repository = repository;
- }
@Override
protected void service(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
String path = request.getPathInfo();
String userAgent = request.getHeader("User-Agent").toLowerCase();
- boolean isBot = false;
+ boolean isBot = true;
boolean isCompatibleBrowser = false;
if (userAgent.contains("bot") || userAgent.contains("facebook") || userAgent.contains("twitter")) {
isBot = true;
@Override
public Session run() throws Exception {
+ Collection<ServiceReference<Repository>> srs = bc.getServiceReferences(Repository.class, "("
+ + ArgeoJcrConstants.JCR_REPOSITORY_ALIAS + "=" + ArgeoJcrConstants.ALIAS_NODE + ")");
+ Repository repository = bc.getService(srs.iterator().next());
return repository.login();
}
* escaping-html-in-java (+ escaping '). TODO Use
* org.apache.commons.lang.StringEscapeUtils
*/
- private static String escapeHTML(String s) {
+ private String escapeHTML(String s) {
StringBuilder out = new StringBuilder(Math.max(16, s.length()));
for (int i = 0; i < s.length(); i++) {
char c = s.charAt(i);