Compare commits
12 Commits
21a7b6e870
...
master
Author | SHA1 | Date | |
---|---|---|---|
5c3c00e18b | |||
ca3dec0ae1 | |||
fc4d7f1f43 | |||
1fac9b9378 | |||
835e5db92f | |||
816b95afb6 | |||
4e1156d4bc | |||
e4ea50ac66 | |||
33491e3904 | |||
be5b64789a | |||
b894978f92 | |||
ef252f5a19 |
14
README.md
14
README.md
@@ -28,4 +28,16 @@ TODO
|
|||||||
## How to use
|
## How to use
|
||||||
Place a `servers.json` in the Pie Cannon data directory. For GNU/Linux this is `XDG_DATA_HOME` (by default this would be `~/.local/share/piecannon`) (create this directory if it does not exist. For Android this would be the app's "externalFilesDir" (probably something like `Android/data/net.monarchpass.piecannon/files` - the app will tell you when you launch it). See `servers.example.json` for an example of such a file. Whenever you initiate a file upload, Pie Cannon will select one of your defined servers at random and upload the file.
|
Place a `servers.json` in the Pie Cannon data directory. For GNU/Linux this is `XDG_DATA_HOME` (by default this would be `~/.local/share/piecannon`) (create this directory if it does not exist. For Android this would be the app's "externalFilesDir" (probably something like `Android/data/net.monarchpass.piecannon/files` - the app will tell you when you launch it). See `servers.example.json` for an example of such a file. Whenever you initiate a file upload, Pie Cannon will select one of your defined servers at random and upload the file.
|
||||||
|
|
||||||
For FTP/SFTP servers (the only supported types as of now), the `path` is relative to your home directory and should be where `url` points to. i.e. a file uploaded to `path` should be downloadable at `url`. In the future Pie Cannon should be able to get SSH credentials from your agent so you won't need to put a password in this file.
|
#### Server Types
|
||||||
|
The `type` field in the server configuration tells Pie Cannon what type of server to use. The default value is `webdav`.
|
||||||
|
|
||||||
|
##### WebDAV (`webdav`)
|
||||||
|
For WebDAV servers, `url` is where the file is uploaded to and served from. `username` and `password`, if given, are HTTP Basic authentication credentials.
|
||||||
|
|
||||||
|
For setting this up with nginx, see [ngx_http_dav_module](https://nginx.org/en/docs/http/ngx_http_dav_module.html) documentation and also [HTTP Basic Authentication](https://docs.nginx.com/nginx/admin-guide/security-controls/configuring-http-basic-authentication/) guide.
|
||||||
|
|
||||||
|
##### FTP/SFTP (`ftp`/`sftp`)
|
||||||
|
For FTP/SFTP servers, the `path` is relative to your home directory and should be where `url` points to. i.e. a file uploaded to `path` should be downloadable at `url`. In the future Pie Cannon should be able to get SSH credentials from your agent so you won't need to put a password in this file.
|
||||||
|
|
||||||
|
##### GoFile.io (`gofile`)
|
||||||
|
No configuration options are supported for this currently, however in the future there may be support for using a token. Note that it's not possible to get a direct download link for this service without visiting a page first, so Pie Cannon returns the URL for that page instead of a direct download link.
|
||||||
|
@@ -1,6 +1,9 @@
|
|||||||
<factorypath>
|
<factorypath>
|
||||||
<factorypathentry kind="VARJAR" id="M2_REPO/net/monarchpass/libpiecannon/0.0.1-SNAPSHOT/libpiecannon-0.0.1-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
|
<factorypathentry kind="VARJAR" id="M2_REPO/net/monarchpass/libpiecannon/0.0.1-SNAPSHOT/libpiecannon-0.0.1-SNAPSHOT.jar" enabled="true" runInBatchMode="false"/>
|
||||||
<factorypathentry kind="VARJAR" id="M2_REPO/com/github/mwiede/jsch/0.1.60/jsch-0.1.60.jar" enabled="true" runInBatchMode="false"/>
|
<factorypathentry kind="VARJAR" id="M2_REPO/com/github/mwiede/jsch/0.1.60/jsch-0.1.60.jar" enabled="true" runInBatchMode="false"/>
|
||||||
|
<factorypathentry kind="VARJAR" id="M2_REPO/com/google/code/gson/gson/2.8.6/gson-2.8.6.jar" enabled="true" runInBatchMode="false"/>
|
||||||
|
<factorypathentry kind="VARJAR" id="M2_REPO/org/jodd/jodd-http/6.0.3/jodd-http-6.0.3.jar" enabled="true" runInBatchMode="false"/>
|
||||||
|
<factorypathentry kind="VARJAR" id="M2_REPO/org/jodd/jodd-util/6.0.0/jodd-util-6.0.0.jar" enabled="true" runInBatchMode="false"/>
|
||||||
<factorypathentry kind="VARJAR" id="M2_REPO/com/google/guava/guava/30.0-jre/guava-30.0-jre.jar" enabled="true" runInBatchMode="false"/>
|
<factorypathentry kind="VARJAR" id="M2_REPO/com/google/guava/guava/30.0-jre/guava-30.0-jre.jar" enabled="true" runInBatchMode="false"/>
|
||||||
<factorypathentry kind="VARJAR" id="M2_REPO/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar" enabled="true" runInBatchMode="false"/>
|
<factorypathentry kind="VARJAR" id="M2_REPO/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar" enabled="true" runInBatchMode="false"/>
|
||||||
<factorypathentry kind="VARJAR" id="M2_REPO/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar" enabled="true" runInBatchMode="false"/>
|
<factorypathentry kind="VARJAR" id="M2_REPO/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar" enabled="true" runInBatchMode="false"/>
|
||||||
@@ -9,6 +12,5 @@
|
|||||||
<factorypathentry kind="VARJAR" id="M2_REPO/com/google/errorprone/error_prone_annotations/2.3.4/error_prone_annotations-2.3.4.jar" enabled="true" runInBatchMode="false"/>
|
<factorypathentry kind="VARJAR" id="M2_REPO/com/google/errorprone/error_prone_annotations/2.3.4/error_prone_annotations-2.3.4.jar" enabled="true" runInBatchMode="false"/>
|
||||||
<factorypathentry kind="VARJAR" id="M2_REPO/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar" enabled="true" runInBatchMode="false"/>
|
<factorypathentry kind="VARJAR" id="M2_REPO/com/google/j2objc/j2objc-annotations/1.3/j2objc-annotations-1.3.jar" enabled="true" runInBatchMode="false"/>
|
||||||
<factorypathentry kind="VARJAR" id="M2_REPO/net/kothar/xdg-java/0.1.1/xdg-java-0.1.1.jar" enabled="true" runInBatchMode="false"/>
|
<factorypathentry kind="VARJAR" id="M2_REPO/net/kothar/xdg-java/0.1.1/xdg-java-0.1.1.jar" enabled="true" runInBatchMode="false"/>
|
||||||
<factorypathentry kind="VARJAR" id="M2_REPO/com/google/code/gson/gson/2.8.6/gson-2.8.6.jar" enabled="true" runInBatchMode="false"/>
|
|
||||||
<factorypathentry kind="VARJAR" id="M2_REPO/org/projectlombok/lombok/1.18.16/lombok-1.18.16.jar" enabled="true" runInBatchMode="false"/>
|
<factorypathentry kind="VARJAR" id="M2_REPO/org/projectlombok/lombok/1.18.16/lombok-1.18.16.jar" enabled="true" runInBatchMode="false"/>
|
||||||
</factorypath>
|
</factorypath>
|
||||||
|
12
desktop/Makefile
Normal file
12
desktop/Makefile
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
PREFIX=~/.local
|
||||||
|
DEST=$(PREFIX)/lib/piecannon
|
||||||
|
COMMAND=$(PREFIX)/bin/piecannon
|
||||||
|
|
||||||
|
target:
|
||||||
|
mvn install
|
||||||
|
|
||||||
|
install: target
|
||||||
|
mkdir -p $(DEST)
|
||||||
|
cp target/piecannon-*.jar $(DEST)/piecannon.jar
|
||||||
|
sed "s#@JAR_PATH@#$(DEST)/piecannon.jar#g" piecannon.in > $(COMMAND)
|
||||||
|
chmod +x $(COMMAND)
|
@@ -1,20 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
PC_GROUP="net.monarchpass"
|
|
||||||
PC_ARTIFACT="piecannon-desktop-app"
|
|
||||||
PC_VERSION="0.0.1-SNAPSHOT"
|
|
||||||
PC_CLASS="net.monarchpass.piecannon.App"
|
|
||||||
|
|
||||||
STUB_POM="<project xmlns='http://maven.apache.org/POM/4.0.0' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd'> <modelVersion>4.0.0</modelVersion> <groupId>$PC_GROUP</groupId> <artifactId>piecannon-launcher</artifactId> <version>$PC_VERSION</version> <dependencies> <dependency><groupId>$PC_GROUP</groupId><artifactId>$PC_ARTIFACT</artifactId><version>\${project.version}</version></dependency></dependencies></project>"
|
|
||||||
STUB_POM_FILE=/tmp/pc.xml
|
|
||||||
echo $STUB_POM > $STUB_POM_FILE
|
|
||||||
|
|
||||||
OUTPUT=$(mvn -f $STUB_POM_FILE -B exec:java -Dexec.mainClass=$PC_CLASS -Dexec.arguments=$1 -Dorg.slf4j.simpleLogger.defaultLogLevel=WARN)
|
|
||||||
EXEC_RESULT=$?
|
|
||||||
echo "$OUTPUT"
|
|
||||||
|
|
||||||
if [ $EXEC_RESULT != 0 ]; then
|
|
||||||
exit $EXEC_RESULT;
|
|
||||||
fi
|
|
||||||
|
|
||||||
RESULT=$(echo "$OUTPUT" | tail -n 1)
|
|
||||||
xdg-open $RESULT
|
|
10
desktop/piecannon.in
Normal file
10
desktop/piecannon.in
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
JAR_PATH=@JAR_PATH@
|
||||||
|
|
||||||
|
if [ "$1" = "--file-selector" ]; then
|
||||||
|
RESULT=$(java -jar "$JAR_PATH" $(yad --file))
|
||||||
|
else
|
||||||
|
RESULT=$(java -jar "$JAR_PATH" "$@")
|
||||||
|
fi
|
||||||
|
|
||||||
|
xdg-open $RESULT
|
@@ -57,6 +57,31 @@
|
|||||||
<artifactId>maven-surefire-plugin</artifactId>
|
<artifactId>maven-surefire-plugin</artifactId>
|
||||||
<version>2.22.2</version>
|
<version>2.22.2</version>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-jar-plugin</artifactId>
|
||||||
|
<configuration>
|
||||||
|
<archive>
|
||||||
|
<manifest>
|
||||||
|
<addClasspath>true</addClasspath>
|
||||||
|
<mainClass>net.monarchpass.piecannon.App</mainClass>
|
||||||
|
</manifest>
|
||||||
|
</archive>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-shade-plugin</artifactId>
|
||||||
|
<version>3.2.4</version>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<phase>package</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>shade</goal>
|
||||||
|
</goals>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
</project>
|
</project>
|
||||||
|
@@ -51,8 +51,16 @@ public class App {
|
|||||||
public static void testServers (final List<Server> servers) {
|
public static void testServers (final List<Server> servers) {
|
||||||
log.log(Level.INFO, "Testing all defined servers");
|
log.log(Level.INFO, "Testing all defined servers");
|
||||||
for (final Server server : servers) {
|
for (final Server server : servers) {
|
||||||
|
Object result;
|
||||||
|
try {
|
||||||
|
result = PieCannon.testServer(server);
|
||||||
|
}
|
||||||
|
catch (final Exception exception) {
|
||||||
|
result = exception;
|
||||||
|
}
|
||||||
|
|
||||||
log.log(Level.INFO, "{0} {1}: {2}", new Object[] {
|
log.log(Level.INFO, "{0} {1}: {2}", new Object[] {
|
||||||
server.getClass().getSimpleName(), server.getLabel(), PieCannon.testServer(server)
|
server.getClass().getSimpleName(), server.getLabel(), result
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -10,16 +10,12 @@ import java.io.IOException;
|
|||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
||||||
import com.google.common.base.Charsets;
|
import com.google.common.base.Charsets;
|
||||||
import com.google.common.io.CharSource;
|
import com.google.common.io.CharSource;
|
||||||
import com.google.common.io.ByteStreams;
|
import com.google.common.io.ByteStreams;
|
||||||
|
|
||||||
import java.util.stream.Collectors;
|
|
||||||
|
|
||||||
import com.google.gson.JsonArray;
|
|
||||||
import com.google.gson.JsonElement;
|
import com.google.gson.JsonElement;
|
||||||
import com.google.gson.JsonObject;
|
import com.google.gson.JsonObject;
|
||||||
import com.google.gson.JsonParser;
|
import com.google.gson.JsonParser;
|
||||||
|
@@ -0,0 +1,42 @@
|
|||||||
|
package net.monarchpass.piecannon.impl;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.net.URI;
|
||||||
|
|
||||||
|
import com.google.common.io.ByteSource;
|
||||||
|
|
||||||
|
import jodd.http.HttpRequest;
|
||||||
|
import jodd.http.HttpResponse;
|
||||||
|
import lombok.Data;
|
||||||
|
import net.monarchpass.piecannon.Server;
|
||||||
|
|
||||||
|
@Data
|
||||||
|
public class WebDavServer implements Server {
|
||||||
|
private final String label;
|
||||||
|
private final URI uri;
|
||||||
|
|
||||||
|
private final String username;
|
||||||
|
private final String password;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public URI upload (String name, ByteSource source) {
|
||||||
|
try {
|
||||||
|
final URI target = URI.create(uri.toString() + "/" + name.replace(" ", "%20"));
|
||||||
|
final HttpRequest request = HttpRequest.put(target.toString())
|
||||||
|
.body(source.read(), "");
|
||||||
|
|
||||||
|
if (username != null && password != null) {
|
||||||
|
request.basicAuthentication(username, password);
|
||||||
|
}
|
||||||
|
|
||||||
|
final HttpResponse response = request.send();
|
||||||
|
if (response.statusCode() >= 400) {
|
||||||
|
throw new RuntimeException(response.statusCode() + ": " + response.statusPhrase());
|
||||||
|
}
|
||||||
|
|
||||||
|
return target;
|
||||||
|
} catch (final IOException exception) {
|
||||||
|
throw new RuntimeException(exception);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@@ -20,7 +20,7 @@ public class ServerFactory implements Function<JsonObject, Server> {
|
|||||||
.orElse("webdav");
|
.orElse("webdav");
|
||||||
|
|
||||||
if (type.equals("webdav")) {
|
if (type.equals("webdav")) {
|
||||||
return makeWebDavServer(object);
|
return makeWebDavServer(object);
|
||||||
} else if (type.equalsIgnoreCase("gofile")) {
|
} else if (type.equalsIgnoreCase("gofile")) {
|
||||||
return new GoFileServer(Optional.ofNullable(object.getAsJsonPrimitive("label")).map(JsonPrimitive::getAsString).orElse("GoFile"));
|
return new GoFileServer(Optional.ofNullable(object.getAsJsonPrimitive("label")).map(JsonPrimitive::getAsString).orElse("GoFile"));
|
||||||
} else if (type.equalsIgnoreCase("ftp")) {
|
} else if (type.equalsIgnoreCase("ftp")) {
|
||||||
|
Reference in New Issue
Block a user