Removing @Deprecated methods / classes from jetty-9.4.x merge
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
This commit is contained in:
Joakim Erdfelt
parent
36ef975353
commit
583e443c66
|
|
@ -497,27 +497,6 @@ public class HttpClient extends ContainerLifeCycle
|
||||||
return uri;
|
return uri;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns a {@link Destination} for the given scheme, host and port.
|
|
||||||
* Applications may use {@link Destination}s to create {@link Connection}s
|
|
||||||
* that will be outside HttpClient's pooling mechanism, to explicitly
|
|
||||||
* control the connection lifecycle (in particular their termination with
|
|
||||||
* {@link Connection#close()}).
|
|
||||||
*
|
|
||||||
* @param scheme the destination scheme
|
|
||||||
* @param host the destination host
|
|
||||||
* @param port the destination port
|
|
||||||
* @return the destination
|
|
||||||
* @see #getDestinations()
|
|
||||||
* @deprecated use {@link #resolveDestination(Request)} instead
|
|
||||||
*/
|
|
||||||
@Deprecated
|
|
||||||
public Destination getDestination(String scheme, String host, int port)
|
|
||||||
{
|
|
||||||
Origin origin = createOrigin(scheme, host, port);
|
|
||||||
return resolveDestination(new HttpDestination.Key(origin, null));
|
|
||||||
}
|
|
||||||
|
|
||||||
public Destination resolveDestination(Request request)
|
public Destination resolveDestination(Request request)
|
||||||
{
|
{
|
||||||
Origin origin = createOrigin(request.getScheme(), request.getHost(), request.getPort());
|
Origin origin = createOrigin(request.getScheme(), request.getHost(), request.getPort());
|
||||||
|
|
|
||||||
|
|
@ -1,104 +0,0 @@
|
||||||
//
|
|
||||||
// ========================================================================
|
|
||||||
// Copyright (c) 1995-2019 Mort Bay Consulting Pty. Ltd.
|
|
||||||
// ------------------------------------------------------------------------
|
|
||||||
// All rights reserved. This program and the accompanying materials
|
|
||||||
// are made available under the terms of the Eclipse Public License v1.0
|
|
||||||
// and Apache License v2.0 which accompanies this distribution.
|
|
||||||
//
|
|
||||||
// The Eclipse Public License is available at
|
|
||||||
// http://www.eclipse.org/legal/epl-v10.html
|
|
||||||
//
|
|
||||||
// The Apache License v2.0 is available at
|
|
||||||
// http://www.opensource.org/licenses/apache2.0.php
|
|
||||||
//
|
|
||||||
// You may elect to redistribute this code under either of these licenses.
|
|
||||||
// ========================================================================
|
|
||||||
//
|
|
||||||
|
|
||||||
package org.eclipse.jetty.security.jaspi.modules;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.util.Map;
|
|
||||||
import javax.security.auth.Subject;
|
|
||||||
import javax.security.auth.callback.CallbackHandler;
|
|
||||||
import javax.security.auth.callback.UnsupportedCallbackException;
|
|
||||||
import javax.security.auth.message.AuthException;
|
|
||||||
import javax.security.auth.message.AuthStatus;
|
|
||||||
import javax.security.auth.message.MessageInfo;
|
|
||||||
import javax.security.auth.message.MessagePolicy;
|
|
||||||
import javax.servlet.http.HttpServletRequest;
|
|
||||||
import javax.servlet.http.HttpServletResponse;
|
|
||||||
|
|
||||||
import org.eclipse.jetty.http.HttpHeader;
|
|
||||||
import org.eclipse.jetty.util.log.Log;
|
|
||||||
import org.eclipse.jetty.util.log.Logger;
|
|
||||||
import org.eclipse.jetty.util.security.Constraint;
|
|
||||||
|
|
||||||
@Deprecated
|
|
||||||
public class BasicAuthModule extends BaseAuthModule
|
|
||||||
{
|
|
||||||
private static final Logger LOG = Log.getLogger(BasicAuthModule.class);
|
|
||||||
|
|
||||||
private String realmName;
|
|
||||||
|
|
||||||
private static final String REALM_KEY = "org.eclipse.jetty.security.jaspi.modules.RealmName";
|
|
||||||
|
|
||||||
public BasicAuthModule()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public BasicAuthModule(CallbackHandler callbackHandler, String realmName)
|
|
||||||
{
|
|
||||||
super(callbackHandler);
|
|
||||||
this.realmName = realmName;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void initialize(MessagePolicy requestPolicy, MessagePolicy responsePolicy,
|
|
||||||
CallbackHandler handler, Map options)
|
|
||||||
throws AuthException
|
|
||||||
{
|
|
||||||
super.initialize(requestPolicy, responsePolicy, handler, options);
|
|
||||||
realmName = (String)options.get(REALM_KEY);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public AuthStatus validateRequest(MessageInfo messageInfo, Subject clientSubject,
|
|
||||||
Subject serviceSubject)
|
|
||||||
throws AuthException
|
|
||||||
{
|
|
||||||
HttpServletRequest request = (HttpServletRequest)messageInfo.getRequestMessage();
|
|
||||||
HttpServletResponse response = (HttpServletResponse)messageInfo.getResponseMessage();
|
|
||||||
String credentials = request.getHeader(HttpHeader.AUTHORIZATION.asString());
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
if (credentials != null)
|
|
||||||
{
|
|
||||||
if (LOG.isDebugEnabled())
|
|
||||||
LOG.debug("Credentials: " + credentials);
|
|
||||||
if (login(clientSubject, credentials, Constraint.__BASIC_AUTH, messageInfo))
|
|
||||||
{
|
|
||||||
return AuthStatus.SUCCESS;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!isMandatory(messageInfo))
|
|
||||||
{
|
|
||||||
return AuthStatus.SUCCESS;
|
|
||||||
}
|
|
||||||
response.setHeader(HttpHeader.WWW_AUTHENTICATE.asString(), "basic realm=\"" + realmName + '"');
|
|
||||||
response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
|
|
||||||
return AuthStatus.SEND_CONTINUE;
|
|
||||||
}
|
|
||||||
catch (IOException e)
|
|
||||||
{
|
|
||||||
throw new AuthException(e.getMessage());
|
|
||||||
}
|
|
||||||
catch (UnsupportedCallbackException e)
|
|
||||||
{
|
|
||||||
throw new AuthException(e.getMessage());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -23,7 +23,6 @@ import java.io.ObjectInputStream;
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import javax.servlet.http.HttpSession;
|
import javax.servlet.http.HttpSession;
|
||||||
import javax.servlet.http.HttpSessionActivationListener;
|
import javax.servlet.http.HttpSessionActivationListener;
|
||||||
import javax.servlet.http.HttpSessionBindingEvent;
|
|
||||||
import javax.servlet.http.HttpSessionBindingListener;
|
import javax.servlet.http.HttpSessionBindingListener;
|
||||||
import javax.servlet.http.HttpSessionEvent;
|
import javax.servlet.http.HttpSessionEvent;
|
||||||
|
|
||||||
|
|
@ -113,16 +112,4 @@ public class SessionAuthentication extends AbstractUserAuthentication
|
||||||
_session = se.getSession();
|
_session = se.getSession();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
@Deprecated
|
|
||||||
public void valueBound(HttpSessionBindingEvent event)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
@Deprecated
|
|
||||||
public void valueUnbound(HttpSessionBindingEvent event)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue