Implements several services and improves API

httpchannel-service/httpchannel-service-depositfiles/pom.xml

@@ -0,0 +1,20 @@
+<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>httpchannel-service</artifactId>
+    <groupId>com.rogiel.httpchannel</groupId>
+    <version>1.0.0</version>
+    <relativePath>..</relativePath>
+  </parent>
+  <artifactId>httpchannel-service-depositfiles</artifactId>
+  <groupId>com.rogiel.httpchannel.services</groupId>
+  <name>HttpChannel/Service/DepositFiles</name>
+  <description>Provides upload access to depositfiles.com</description>
+  <dependencies>
+  	<dependency>
+  		<groupId>com.rogiel.httpchannel</groupId>
+  		<artifactId>httpchannel-captcha-recaptcha</artifactId>
+  		<version>1.0.0</version>
+  	</dependency>
+  </dependencies>
+</project>

httpchannel-service/httpchannel-service-depositfiles/src/main/java/com/rogiel/httpchannel/service/impl/DepositFilesService.java

@@ -0,0 +1,212 @@
+package com.rogiel.httpchannel.service.impl;
+
+import java.io.IOException;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.regex.Pattern;
+
+import com.rogiel.httpchannel.captcha.impl.ReCaptcha;
+import com.rogiel.httpchannel.captcha.impl.ReCaptchaService;
+import com.rogiel.httpchannel.service.AbstractAuthenticator;
+import com.rogiel.httpchannel.service.AbstractHttpService;
+import com.rogiel.httpchannel.service.AbstractUploader;
+import com.rogiel.httpchannel.service.AuthenticationService;
+import com.rogiel.httpchannel.service.Authenticator;
+import com.rogiel.httpchannel.service.AuthenticatorCapability;
+import com.rogiel.httpchannel.service.CapabilityMatrix;
+import com.rogiel.httpchannel.service.Credential;
+import com.rogiel.httpchannel.service.Service;
+import com.rogiel.httpchannel.service.ServiceID;
+import com.rogiel.httpchannel.service.UploadChannel;
+import com.rogiel.httpchannel.service.UploadService;
+import com.rogiel.httpchannel.service.Uploader;
+import com.rogiel.httpchannel.service.UploaderCapability;
+import com.rogiel.httpchannel.service.channel.LinkedUploadChannel;
+import com.rogiel.httpchannel.service.channel.LinkedUploadChannel.LinkedUploadChannelCloseCallback;
+import com.rogiel.httpchannel.service.config.NullAuthenticatorConfiguration;
+import com.rogiel.httpchannel.service.config.NullUploaderConfiguration;
+import com.rogiel.httpchannel.service.exception.AuthenticationInvalidCredentialException;
+import com.rogiel.httpchannel.service.exception.UnresolvedCaptchaException;
+import com.rogiel.httpchannel.util.htmlparser.HTMLPage;
+
+/**
+ * This service handles uploads to UploadKing.com.
+ * 
+ * @author <a href="http://www.rogiel.com/">Rogiel</a>
+ * @since 1.0
+ */
+public class DepositFilesService extends AbstractHttpService implements
+		Service, UploadService<NullUploaderConfiguration>,
+		AuthenticationService<NullAuthenticatorConfiguration> {
+	/**
+	 * This service ID
+	 */
+	public static final ServiceID SERVICE_ID = ServiceID.create("depositfiles");
+
+	private static final Pattern UPLOAD_URL_PATTERN = Pattern
+			.compile("http://fileshare([0-9]*)\\.depositfiles\\.com/(.*)/\\?X-Progress-ID=(.*)");
+	private static final Pattern DOWNLOAD_URL_PATTERN = Pattern
+			.compile("http://(www\\.)?depositfiles\\.com/files/([0-9A-z]*)");
+
+	private static final Pattern VALID_LOGIN_REDIRECT = Pattern
+			.compile("window.location.href");
+
+	private final ReCaptchaService captchaService = new ReCaptchaService();
+
+	@Override
+	public ServiceID getID() {
+		return SERVICE_ID;
+	}
+
+	@Override
+	public int getMajorVersion() {
+		return 1;
+	}
+
+	@Override
+	public int getMinorVersion() {
+		return 0;
+	}
+
+	@Override
+	public Uploader<NullUploaderConfiguration> getUploader(String filename,
+			long filesize, NullUploaderConfiguration configuration) {
+		return new UploadKingUploader(filename, filesize, configuration);
+	}
+
+	@Override
+	public Uploader<NullUploaderConfiguration> getUploader(String filename,
+			long filesize) {
+		return getUploader(filename, filesize, newUploaderConfiguration());
+	}
+
+	@Override
+	public NullUploaderConfiguration newUploaderConfiguration() {
+		return NullUploaderConfiguration.SHARED_INSTANCE;
+	}
+
+	@Override
+	public long getMaximumFilesize() {
+		return 2 * 1024 * 1024 * 1024;
+	}
+
+	@Override
+	public String[] getSupportedExtensions() {
+		return null;
+	}
+
+	@Override
+	public CapabilityMatrix<UploaderCapability> getUploadCapabilities() {
+		return new CapabilityMatrix<UploaderCapability>(
+				UploaderCapability.UNAUTHENTICATED_UPLOAD,
+				UploaderCapability.NON_PREMIUM_ACCOUNT_UPLOAD,
+				UploaderCapability.PREMIUM_ACCOUNT_UPLOAD);
+	}
+
+	@Override
+	public Authenticator<NullAuthenticatorConfiguration> getAuthenticator(
+			Credential credential, NullAuthenticatorConfiguration configuration) {
+		return new UploadKingAuthenticator(credential, configuration);
+	}
+
+	@Override
+	public Authenticator<NullAuthenticatorConfiguration> getAuthenticator(
+			Credential credential) {
+		return getAuthenticator(credential, newAuthenticatorConfiguration());
+	}
+
+	@Override
+	public NullAuthenticatorConfiguration newAuthenticatorConfiguration() {
+		return NullAuthenticatorConfiguration.SHARED_INSTANCE;
+	}
+
+	@Override
+	public CapabilityMatrix<AuthenticatorCapability> getAuthenticationCapability() {
+		return new CapabilityMatrix<AuthenticatorCapability>();
+	}
+
+	protected class UploadKingUploader extends
+			AbstractUploader<NullUploaderConfiguration> implements
+			Uploader<NullUploaderConfiguration>,
+			LinkedUploadChannelCloseCallback {
+		private Future<HTMLPage> uploadFuture;
+
+		public UploadKingUploader(String filename, long filesize,
+				NullUploaderConfiguration configuration) {
+			super(filename, filesize, configuration);
+		}
+
+		@Override
+		public UploadChannel openChannel() throws IOException {
+			final HTMLPage page = get("http://www.depositfiles.com/").asPage();
+
+			final String url = page.findFormAction(UPLOAD_URL_PATTERN);
+			final String uploadID = page.getInputValue("UPLOAD_IDENTIFIER");
+			final String maxFileSize = page.getInputValue("MAX_FILE_SIZE");
+
+			final LinkedUploadChannel channel = createLinkedChannel(this);
+			uploadFuture = multipartPost(url).parameter("files", channel)
+					.parameter("go", true)
+					.parameter("UPLOAD_IDENTIFIER", uploadID)
+					.parameter("agree", true)
+					.parameter("MAX_FILE_SIZE", maxFileSize).asPageAsync();
+			return waitChannelLink(channel, uploadFuture);
+		}
+
+		@Override
+		public String finish() throws IOException {
+			try {
+				final String link = uploadFuture.get().findScript(
+						DOWNLOAD_URL_PATTERN, 0);
+				if (link == null)
+					return null;
+				return link;
+			} catch (InterruptedException e) {
+				return null;
+			} catch (ExecutionException e) {
+				throw (IOException) e.getCause();
+			}
+		}
+	}
+
+	protected class UploadKingAuthenticator extends
+			AbstractAuthenticator<NullAuthenticatorConfiguration> implements
+			Authenticator<NullAuthenticatorConfiguration> {
+		public UploadKingAuthenticator(Credential credential,
+				NullAuthenticatorConfiguration configuration) {
+			super(credential, configuration);
+		}
+
+		@Override
+		public void login() throws IOException {
+			HTMLPage page = post("http://depositfiles.com/login.php?return=%2F")
+					.parameter("go", true)
+					.parameter("login", credential.getUsername())
+					.parameter("password", credential.getPassword()).asPage();
+
+			final ReCaptcha captcha = captchaService.create(page);
+			if (captcha != null) {
+				if (!resolveCaptcha(captcha))
+					throw new UnresolvedCaptchaException();
+				page = post("http://depositfiles.com/login.php?return=%2F")
+						.parameter("go", true)
+						.parameter("login", credential.getUsername())
+						.parameter("password", credential.getPassword())
+						.parameter("recaptcha_challenge_field", captcha.getID())
+						.parameter("recaptcha_response_field",
+								captcha.getAnswer()).asPage();
+			}
+
+			if (!page.contains(VALID_LOGIN_REDIRECT))
+				throw new AuthenticationInvalidCredentialException();
+			return;
+		}
+
+		@Override
+		public void logout() throws IOException {
+			post("http://www.uploadking.com/login").parameter("do", "logout")
+					.request();
+			// TODO check logout status
+		}
+	}
+}

httpchannel-service/httpchannel-service-depositfiles/src/main/resources/META-INF/services/com.rogiel.httpchannel.service.Service

@@ -0,0 +1 @@
+com.rogiel.httpchannel.service.impl.MultiUploadService

httpchannel-service/httpchannel-service-depositfiles/src/test/java/com/rogiel/httpchannel/service/impl/DepositFilesServiceTest.java

@@ -0,0 +1,39 @@
+package com.rogiel.httpchannel.service.impl;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.net.URL;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import junit.framework.Assert;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.rogiel.httpchannel.service.UploaderCapability;
+import com.rogiel.httpchannel.util.ChannelUtils;
+
+public class DepositFilesServiceTest {
+	private DepositFilesService service;
+
+	@Before
+	public void setUp() throws Exception {
+		service = new DepositFilesService();
+	}
+
+	@Test
+	public void testNonLoguedInUploader() throws IOException {
+		assertTrue(
+				"This service does not have the capability UploadCapability.UNAUTHENTICATED_UPLOAD",
+				service.getUploadCapabilities().has(
+						UploaderCapability.UNAUTHENTICATED_UPLOAD));
+
+		final Path path = Paths.get("src/test/resources/upload-test-file.txt");
+		final URL url = ChannelUtils.upload(service, path);
+
+		Assert.assertNotNull(url);
+		System.out.println(url);
+	}
+}

httpchannel-service/httpchannel-service-depositfiles/src/test/resources/upload-test-file.txt

@@ -0,0 +1,3 @@
+This is a simple upload test file.
+
+This is for testing purposes only.