xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Omaha #5152 Add custom NetworkTraffic connector and endpoint." into omaha_16.2.2

Browse source 
Former-commit-id: bd9d39c7ac58cd43aa1bc4290e82926fe023ba97
This commit is contained in:
Nate Jensen 2015-12-08 14:25:07 -06:00 • committed by Gerrit Code Review
commit 202a70b39e
3 changed files with 248 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

95
edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/web/security/NetworkTrafficSelectChannelConnector.java Normal file
View file

@ -0,0 +1,95 @@
/**
* This software was developed and / or modified by Raytheon Company,
* pursuant to Contract DG133W-05-CQ-1067 with the US Government.
*
* U.S. EXPORT CONTROLLED TECHNICAL DATA
* This software product contains export-restricted data whose
* export/transfer/disclosure is restricted by U.S. law. Dissemination
* to non-U.S. persons whether in the United States or abroad requires
* an export license or other authorization.
*
* Contractor Name: Raytheon Company
* Contractor Address: 6825 Pine Street, Suite 340
* Mail Stop B8
* Omaha, NE 68106
* 402.291.0100
*
* See the AWIPS II Master Rights File ("Master Rights File.pdf") for
* further licensing information.
**/
package com.raytheon.uf.edex.registry.ebxml.web.security;
import java.io.IOException;
import java.nio.channels.SelectionKey;
import java.nio.channels.SocketChannel;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import org.eclipse.jetty.io.NetworkTrafficListener;
import org.eclipse.jetty.io.SelectChannelEndPoint;
import org.eclipse.jetty.io.SelectorManager;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.util.ssl.SslContextFactory;
/**
* Custom version of
* org.eclipse.jetty.server.nio.NetworkTrafficSelectChannelConnector to create
* an updated version of
* org.eclipse.jetty.io.NetworkTrafficSelectChannelEndPoint which does not
* suffer from the bug described here:
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=431519
*
* This class should not be needed when Jetty is upgraded beyond 9.1.5.
*
* <pre>
*
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Dec 1, 2015 5152 nabowle Initial creation
*
* </pre>
*
* @author nabowle
* @version 1.0
*/
public class NetworkTrafficSelectChannelConnector extends ServerConnector {
private final List<NetworkTrafficListener> listeners = new CopyOnWriteArrayList<NetworkTrafficListener>();
public NetworkTrafficSelectChannelConnector(Server server,
SslContextFactory sslContextFactory) {
super(server, sslContextFactory);
}
/**
* @param listener
* the listener to add
*/
public void addNetworkTrafficListener(NetworkTrafficListener listener) {
listeners.add(listener);
}
/**
* @param listener
* the listener to remove
*/
public void removeNetworkTrafficListener(NetworkTrafficListener listener) {
listeners.remove(listener);
}
@Override
protected SelectChannelEndPoint newEndPoint(SocketChannel channel,
SelectorManager.ManagedSelector selectSet, SelectionKey key)
throws IOException {
NetworkTrafficSelectChannelEndPoint endPoint = new NetworkTrafficSelectChannelEndPoint(
channel, selectSet, key, getScheduler(), getIdleTimeout(),
listeners);
endPoint.notifyOpened();
return endPoint;
}
}

152
edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/web/security/NetworkTrafficSelectChannelEndPoint.java Normal file
View file

@ -0,0 +1,152 @@
/**
* This software was developed and / or modified by Raytheon Company,
* pursuant to Contract DG133W-05-CQ-1067 with the US Government.
*
* U.S. EXPORT CONTROLLED TECHNICAL DATA
* This software product contains export-restricted data whose
* export/transfer/disclosure is restricted by U.S. law. Dissemination
* to non-U.S. persons whether in the United States or abroad requires
* an export license or other authorization.
*
* Contractor Name: Raytheon Company
* Contractor Address: 6825 Pine Street, Suite 340
* Mail Stop B8
* Omaha, NE 68106
* 402.291.0100
*
* See the AWIPS II Master Rights File ("Master Rights File.pdf") for
* further licensing information.
**/
package com.raytheon.uf.edex.registry.ebxml.web.security;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.channels.SelectionKey;
import java.nio.channels.SocketChannel;
import java.util.List;
import org.eclipse.jetty.io.NetworkTrafficListener;
import org.eclipse.jetty.io.SelectChannelEndPoint;
import org.eclipse.jetty.io.SelectorManager;
import org.eclipse.jetty.util.thread.Scheduler;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
/**
* Updated version of org.eclipse.jetty.io.NetworkTrafficSelectChannelEndPoint
* that does not suffer from the bug described here:
* https://bugs.eclipse.org/bugs/show_bug.cgi?id=431519
*
* This is done by the ByteBuffer view in flush() being created from
* {@link ByteBuffer#slice()} before the flush.
*
* This class should not be needed when Jetty is upgraded beyond 9.1.5.
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Dec 1, 2015 nabowle Initial creation
*
* </pre>
*
* @author nabowle
* @version 1.0
*/
public class NetworkTrafficSelectChannelEndPoint extends SelectChannelEndPoint {
private static final IUFStatusHandler statusHandler = UFStatus
.getHandler(NetworkTrafficSelectChannelEndPoint.class);
private final List<NetworkTrafficListener> listeners;
public NetworkTrafficSelectChannelEndPoint(SocketChannel channel,
SelectorManager.ManagedSelector selectSet, SelectionKey key,
Scheduler scheduler, long idleTimeout,
List<NetworkTrafficListener> listeners) throws IOException {
super(channel, selectSet, key, scheduler, idleTimeout);
this.listeners = listeners;
}
@Override
public int fill(ByteBuffer buffer) throws IOException {
int read = super.fill(buffer);
notifyIncoming(buffer, read);
return read;
}
@Override
public boolean flush(ByteBuffer... buffers) throws IOException {
boolean flushed = true;
for (ByteBuffer b : buffers) {
if (b.hasRemaining()) {
int position = b.position();
ByteBuffer view = b.slice();
flushed &= super.flush(b);
int l = b.position() - position;
view.limit(view.position() + l);
notifyOutgoing(view);
if (!flushed)
break;
}
}
return flushed;
}
public void notifyOpened() {
if (listeners != null && !listeners.isEmpty()) {
for (NetworkTrafficListener listener : listeners) {
try {
listener.opened(getSocket());
} catch (Exception e) {
statusHandler.handle(Priority.WARN,
"Error notifying listener.", e);
}
}
}
}
public void notifyIncoming(ByteBuffer buffer, int read) {
if (listeners != null && !listeners.isEmpty() && read > 0) {
for (NetworkTrafficListener listener : listeners) {
try {
ByteBuffer view = buffer.asReadOnlyBuffer();
listener.incoming(getSocket(), view);
} catch (Exception e) {
statusHandler.handle(Priority.WARN,
"Error notifying listener.", e);
}
}
}
}
public void notifyOutgoing(ByteBuffer view) {
if (listeners != null && !listeners.isEmpty() && view.hasRemaining()) {
for (NetworkTrafficListener listener : listeners) {
try {
listener.outgoing(getSocket(), view);
} catch (Exception e) {
statusHandler.handle(Priority.WARN,
"Error notifying listener.", e);
}
}
}
}
public void notifyClosed() {
if (listeners != null && !listeners.isEmpty()) {
for (NetworkTrafficListener listener : listeners) {
try {
listener.closed(getSocket());
} catch (Exception e) {
statusHandler.handle(Priority.WARN,
"Error notifying listener.", e);
}
}
}
}
}

2
edexOsgi/com.raytheon.uf.edex.registry.ebxml/web/etc/jettyServer.xml
View file

@ -25,7 +25,7 @@
<Call name="addConnector">
<Arg>
<New
class="org.eclipse.jetty.server.nio.NetworkTrafficSelectChannelConnector">
class="com.raytheon.uf.edex.registry.ebxml.web.security.NetworkTrafficSelectChannelConnector">
<Arg>
<Ref refid="RegistryWebServer" />
</Arg>