-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #28 from Zmax0/dev/2.5.0
- Loading branch information
Showing
74 changed files
with
1,498 additions
and
415 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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| @echo off | ||
| set server="urban-spork-client-gui" | ||
| start javaw --add-opens java.base/java.lang.reflect=ALL-UNNAMED -jar %server%.jar | ||
| start javaw --add-opens java.base/java.lang.reflect=com.jfoenix --add-opens javafx.controls/com.sun.javafx.scene.control.behavior=com.jfoenix --add-opens javafx.controls/com.sun.javafx.scene.control=com.jfoenix -jar %server%.jar | ||
| exit |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| module com.urbanspork.client.gui { | ||
| requires ch.qos.logback.classic; | ||
| requires ch.qos.logback.core; | ||
| requires com.fasterxml.jackson.databind; | ||
| requires com.jfoenix; | ||
| requires com.urbanspork.client; | ||
| requires com.urbanspork.common; | ||
| requires io.netty.handler; | ||
| requires java.desktop; | ||
| requires javafx.base; | ||
| requires javafx.controls; | ||
| requires javafx.graphics; | ||
| requires org.slf4j; | ||
|
|
||
| exports com.urbanspork.client.gui.console to javafx.graphics, ch.qos.logback.core; | ||
| exports com.urbanspork.client.gui.tray to javafx.graphics, ch.qos.logback.core; | ||
| } |
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
69 changes: 69 additions & 0 deletions
69
urban-spork-client/src/com/urbanspork/client/ClientHttpUnificationHandler.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,69 @@ | ||
| package com.urbanspork.client; | ||
|
|
||
| import com.urbanspork.common.util.HttpProxyUtil; | ||
| import io.netty.buffer.ByteBuf; | ||
| import io.netty.buffer.Unpooled; | ||
| import io.netty.channel.Channel; | ||
| import io.netty.channel.ChannelHandler; | ||
| import io.netty.channel.ChannelHandlerContext; | ||
| import io.netty.channel.SimpleChannelInboundHandler; | ||
| import io.netty.handler.codec.http.HttpMethod; | ||
|
|
||
| import java.util.function.Consumer; | ||
|
|
||
| @ChannelHandler.Sharable | ||
| class ClientHttpUnificationHandler extends SimpleChannelInboundHandler<ByteBuf> { | ||
| static final ClientHttpUnificationHandler INSTANCE = new ClientHttpUnificationHandler(); | ||
|
|
||
| private ClientHttpUnificationHandler() {} | ||
|
|
||
| @Override | ||
| public void channelRead0(ChannelHandlerContext ctx, ByteBuf msg) { | ||
| HttpProxyUtil.Option option = HttpProxyUtil.parseOption(msg); | ||
| if (HttpMethod.GET == option.method()) { | ||
| new HttpRelayHandler(msg.retain()).connect(ctx.channel(), option.address()); | ||
| } else { | ||
| new HttpsRelayHandler().connect(ctx.channel(), option.address()); | ||
| } | ||
| } | ||
|
|
||
| private record HttpRelayHandler(ByteBuf msg) implements ClientTcpRelayHandler { | ||
| @Override | ||
| public ChannelHandler inboundHandler() { | ||
| return INSTANCE; | ||
| } | ||
|
|
||
| @Override | ||
| public InboundWriter inboundWriter() { | ||
| return new InboundWriter(channel -> {}, channel -> {}); | ||
| } | ||
|
|
||
| @Override | ||
| public Consumer<Channel> outboundWriter() { | ||
| return channel -> channel.writeAndFlush(msg); | ||
| } | ||
| } | ||
|
|
||
| private static class HttpsRelayHandler implements ClientTcpRelayHandler { | ||
| private static final byte[] SUCCESS = "HTTP/1.1 200 Connection established\r\n\r\n".getBytes(); | ||
| private static final byte[] FAILED = "HTTP/1.1 500 Internal Server Error\r\n\r\n".getBytes(); | ||
|
|
||
| @Override | ||
| public ChannelHandler inboundHandler() { | ||
| return INSTANCE; | ||
| } | ||
|
|
||
| @Override | ||
| public InboundWriter inboundWriter() { | ||
| return new InboundWriter( | ||
| channel -> channel.writeAndFlush(Unpooled.wrappedBuffer(SUCCESS)), | ||
| channel -> channel.writeAndFlush(Unpooled.wrappedBuffer(FAILED)) | ||
| ); | ||
| } | ||
|
|
||
| @Override | ||
| public Consumer<Channel> outboundWriter() { | ||
| return channel -> {}; | ||
| } | ||
| } | ||
| } |
21 changes: 21 additions & 0 deletions
21
urban-spork-client/src/com/urbanspork/client/ClientInitializer.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,21 @@ | ||
| package com.urbanspork.client; | ||
|
|
||
| import com.urbanspork.common.channel.AttributeKeys; | ||
| import com.urbanspork.common.config.ServerConfig; | ||
| import io.netty.channel.ChannelInitializer; | ||
| import io.netty.channel.socket.nio.NioSocketChannel; | ||
|
|
||
| class ClientInitializer extends ChannelInitializer<NioSocketChannel> { | ||
|
|
||
| private final ServerConfig config; | ||
|
|
||
| ClientInitializer(ServerConfig config) { | ||
| this.config = config; | ||
| } | ||
|
|
||
| @Override | ||
| protected void initChannel(NioSocketChannel channel) { | ||
| channel.attr(AttributeKeys.SERVER_CONFIG).set(config); | ||
| channel.pipeline().addLast(config.getTrafficShapingHandler(), new ClientProxyUnificationHandler()); | ||
| } | ||
| } |
24 changes: 24 additions & 0 deletions
24
urban-spork-client/src/com/urbanspork/client/ClientProxyUnificationHandler.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,24 @@ | ||
| package com.urbanspork.client; | ||
|
|
||
| import io.netty.buffer.ByteBuf; | ||
| import io.netty.channel.ChannelHandlerContext; | ||
| import io.netty.channel.ChannelPipeline; | ||
| import io.netty.handler.codec.ByteToMessageDecoder; | ||
| import io.netty.handler.codec.socksx.SocksPortUnificationServerHandler; | ||
| import io.netty.handler.codec.socksx.SocksVersion; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| class ClientProxyUnificationHandler extends ByteToMessageDecoder { | ||
| @Override | ||
| protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) { | ||
| SocksVersion version = SocksVersion.valueOf(in.getByte(in.readerIndex())); | ||
| ChannelPipeline p = ctx.pipeline(); | ||
| if (version == SocksVersion.UNKNOWN) { | ||
| p.addLast(ClientHttpUnificationHandler.INSTANCE); | ||
| } else { | ||
| p.addLast(new SocksPortUnificationServerHandler(), ClientSocksMessageHandler.INSTANCE); | ||
| } | ||
| p.remove(this); | ||
| } | ||
| } |
Oops, something went wrong.