forked from gerrit-review/gerrit
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
23 changed files
with
171 additions
and
209 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
88 changes: 88 additions & 0 deletions
88
gerrit-pgm/src/main/java/com/google/gerrit/pgm/http/jetty/GetUserFilter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,88 @@ | ||
// Copyright (C) 2012 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.pgm.http.jetty; | ||
|
||
import com.google.gerrit.server.CurrentUser; | ||
import com.google.gerrit.server.config.GerritServerConfig; | ||
import com.google.inject.Inject; | ||
import com.google.inject.Provider; | ||
import com.google.inject.Singleton; | ||
import com.google.inject.servlet.ServletModule; | ||
|
||
import org.eclipse.jgit.lib.Config; | ||
|
||
import java.io.IOException; | ||
import java.net.URI; | ||
|
||
import javax.servlet.Filter; | ||
import javax.servlet.FilterChain; | ||
import javax.servlet.FilterConfig; | ||
import javax.servlet.ServletException; | ||
import javax.servlet.ServletRequest; | ||
import javax.servlet.ServletResponse; | ||
|
||
/** | ||
* Stores as a request attribute, so the {@link HttpLog} can include the the | ||
* user for the request outside of the request scope. | ||
* | ||
* @author [email protected] (Colby Ranger) | ||
*/ | ||
@Singleton | ||
public class GetUserFilter implements Filter { | ||
|
||
static final String REQ_ATTR_KEY = CurrentUser.class.toString(); | ||
|
||
public static class Module extends ServletModule { | ||
|
||
private boolean loggingEnabled; | ||
|
||
@Inject | ||
Module(@GerritServerConfig final Config cfg) { | ||
URI[] urls = JettyServer.listenURLs(cfg); | ||
boolean reverseProxy = JettyServer.isReverseProxied(urls); | ||
this.loggingEnabled = cfg.getBoolean("httpd", "requestlog", !reverseProxy); | ||
} | ||
|
||
@Override | ||
protected void configureServlets() { | ||
if (loggingEnabled) { | ||
filter("/*").through(GetUserFilter.class); | ||
} | ||
} | ||
} | ||
|
||
private final Provider<CurrentUser> userProvider; | ||
|
||
@Inject | ||
GetUserFilter(final Provider<CurrentUser> userProvider) { | ||
this.userProvider = userProvider; | ||
} | ||
|
||
@Override | ||
public void doFilter( | ||
ServletRequest req, ServletResponse resp, FilterChain chain) | ||
throws IOException, ServletException { | ||
req.setAttribute(REQ_ATTR_KEY, userProvider.get()); | ||
chain.doFilter(req, resp); | ||
} | ||
|
||
@Override | ||
public void destroy() { | ||
} | ||
|
||
@Override | ||
public void init(FilterConfig arg0) { | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 0 additions & 36 deletions
36
gerrit-pgm/src/main/java/com/google/inject/servlet/GuiceHelper.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.