// Copyright (C) 2008 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package com.google.gerrit.httpd.raw;

import com.google.common.cache.Cache;
import com.google.gerrit.server.config.GerritServerConfig;
import com.google.gerrit.server.config.SitePaths;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import com.google.inject.name.Named;

import org.eclipse.jgit.lib.Config;

import java.io.IOException;
import java.nio.file.Path;


/** Sends static content from the site 's {@code static/} subdirectory. */
@Singleton
public class SiteStaticDirectoryServlet extends ResourceServlet {
  private static final long serialVersionUID = 1L;

  private final Path staticBase;

  @Inject
  SiteStaticDirectoryServlet(
      SitePaths site,
      @GerritServerConfig Config cfg,
      @Named(StaticModule.CACHE) Cache<Path, Resource> cache) {
    super(cache, cfg.getBoolean("site", "refreshHeaderFooter", true));
    Path p;
    try {
      p = site.static_dir.toRealPath().normalize();
    } catch (IOException e) {
      p = site.static_dir.toAbsolutePath().normalize();
    }
    staticBase = p;
  }

  @Override
  protected Path getResourcePath(String pathInfo) {
    Path p = staticBase.resolve(pathInfo);
    try {
      p = p.toRealPath().normalize();
      if (!p.startsWith(staticBase)) {
        return null;
      }
      return p;
    } catch (IOException e) {
      return null;
    }
  }
}

@@ -1724,16 +1724,14 @@
     
-Path p =
+return
  sta
@@ -1761,195 +1761,8 @@
 o);%0A
-    try %7B%0A      p = p.toRealPath().normalize();%0A      if (!p.startsWith(staticBase)) %7B%0A        return null;%0A      %7D%0A      return p;%0A    %7D catch (IOException e) %7B%0A      return null;%0A    %7D%0A
   %7D%0A

Allow symlinks