MightyPork/airsonic-custom
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove url redirection

Browse Source 
- Add upnp specific base url
- Use http request base url for areas used by url redirection
- Fix sharing
- Removed Network Settings tab

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>
This commit is contained in:
Andrew DeMaria
2017-03-03 15:23:59 -07:00
parent f1ab639a48
commit 8b92f2bc51
54 changed files with 155 additions and 1205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libresonic-main/src/test/java/org/libresonic/player/service/SettingsServiceTestCase.java
-3
View File
@@ -63,7 +63,6 @@ public class SettingsServiceTestCase extends TestCase {
assertEquals("Wrong default Podcast episode download count.", 1, settingsService.getPodcastEpisodeDownloadCount());
assertTrue("Wrong default Podcast folder.", settingsService.getPodcastFolder().endsWith("Podcast"));
assertEquals("Wrong default Podcast update interval.", 24, settingsService.getPodcastUpdateInterval());
assertEquals("Wrong default rewrite URL enabled.", true, settingsService.isRewriteUrlEnabled());
assertEquals("Wrong default LDAP enabled.", false, settingsService.isLdapEnabled());
assertEquals("Wrong default LDAP URL.", "ldap://host.domain.com:389/cn=Users,dc=domain,dc=com", settingsService.getLdapUrl());
assertNull("Wrong default LDAP manager DN.", settingsService.getLdapManagerDn());
@@ -89,7 +88,6 @@ public class SettingsServiceTestCase extends TestCase {
settingsService.setPodcastEpisodeDownloadCount(-1);
settingsService.setPodcastFolder("d:/podcasts");
settingsService.setPodcastUpdateInterval(-1);
settingsService.setRewriteUrlEnabled(false);
settingsService.setLdapEnabled(true);
settingsService.setLdapUrl("newLdapUrl");
settingsService.setLdapManagerDn("admin");
@@ -126,7 +124,6 @@ public class SettingsServiceTestCase extends TestCase {
assertEquals("Wrong Podcast episode download count.", -1, settingsService.getPodcastEpisodeDownloadCount());
assertEquals("Wrong Podcast folder.", "d:/podcasts", settingsService.getPodcastFolder());
assertEquals("Wrong Podcast update interval.", -1, settingsService.getPodcastUpdateInterval());
assertEquals("Wrong rewrite URL enabled.", false, settingsService.isRewriteUrlEnabled());
assertTrue("Wrong LDAP enabled.", settingsService.isLdapEnabled());
assertEquals("Wrong LDAP URL.", "newLdapUrl", settingsService.getLdapUrl());
assertEquals("Wrong LDAP manager DN.", "admin", settingsService.getLdapManagerDn());
libresonic-main/src/test/java/org/libresonic/player/util/StringUtilTestCase.java
-40
View File
@@ -20,9 +20,7 @@
package org.libresonic.player.util;
import junit.framework.TestCase;
import org.libresonic.player.domain.UrlRedirectType;
import java.net.MalformedURLException;
import java.util.Arrays;
import java.util.Locale;
@@ -182,22 +180,6 @@ public class StringUtilTestCase extends TestCase {
assertEquals("Error in fileSystemSafe().", "foo-bar", StringUtil.fileSystemSafe("foo:bar"));
}
public void testRewriteUrl() {
assertEquals("Error in rewriteUrl().", "http://foo/", StringUtil.rewriteUrl("http://foo/", "http://foo/"));
assertEquals("Error in rewriteUrl().", "http://foo:81/", StringUtil.rewriteUrl("http://foo/", "http://foo:81/"));
assertEquals("Error in rewriteUrl().", "http://bar/", StringUtil.rewriteUrl("http://foo/", "http://bar/"));
assertEquals("Error in rewriteUrl().", "http://bar.com/", StringUtil.rewriteUrl("http://foo.com/", "http://bar.com/"));
assertEquals("Error in rewriteUrl().", "http://bar.com/", StringUtil.rewriteUrl("http://foo.com/", "http://bar.com/"));
assertEquals("Error in rewriteUrl().", "http://bar.com/a", StringUtil.rewriteUrl("http://foo.com/a", "http://bar.com/"));
assertEquals("Error in rewriteUrl().", "http://bar.com/a/b", StringUtil.rewriteUrl("http://foo.com/a/b", "http://bar.com/c"));
assertEquals("Error in rewriteUrl().", "http://bar.com:8080/a?b=1&c=2", StringUtil.rewriteUrl("http://foo.com/a?b=1&c=2", "http://bar.com:8080/e?f=3"));
assertEquals("Error in rewriteUrl().", "http://foo.com:8080/a?b=1&c=2", StringUtil.rewriteUrl("http://foo.com/a?b=1&c=2", "http://foo.com:8080/e?f=3"));
assertEquals("Error in rewriteUrl().", "https://foo.com:8080/a?b=1&c=2", StringUtil.rewriteUrl("http://foo.com/a?b=1&c=2", "https://foo.com:8080/e?f=3"));
assertEquals("Error in rewriteUrl().", "http://foo/", StringUtil.rewriteUrl("http://foo/", "not:a:url"));
assertEquals("Error in rewriteUrl().", "http://foo/", StringUtil.rewriteUrl("http://foo/", ""));
assertEquals("Error in rewriteUrl().", "http://foo/", StringUtil.rewriteUrl("http://foo/", null));
}
public void testRemoveMarkup() {
assertEquals("Error in removeMarkup()", "foo", StringUtil.removeMarkup("<b>foo</b>"));
assertEquals("Error in removeMarkup()", "foobar", StringUtil.removeMarkup("<b>foo</b>bar"));
@@ -206,26 +188,4 @@ public class StringUtilTestCase extends TestCase {
assertEquals("Error in removeMarkup()", null, StringUtil.removeMarkup(null));
}
public void testRewriteRemoteUrl() throws MalformedURLException {
UrlRedirectType urlRedirectType = UrlRedirectType.NORMAL;
String urlRedirectCustomUrl = null;
assertEquals("http://192.168.1.10:4040/stream?id=42",
StringUtil.rewriteRemoteUrl("http://localhost:4040/stream?id=42", false, urlRedirectType, null, urlRedirectCustomUrl, "", "192.168.1.10", 4040));
assertEquals("http://192.168.1.10:4040/libresonic/stream?id=42",
StringUtil.rewriteRemoteUrl("http://localhost:4040/libresonic/stream?id=42", false, urlRedirectType, null, urlRedirectCustomUrl, "libresonic", "192.168.1.10", 4040));
assertEquals("http://192.168.1.10:4040/stream?id=42",
StringUtil.rewriteRemoteUrl("https://localhost:4443/stream?id=42", false, urlRedirectType, null, urlRedirectCustomUrl, "", "192.168.1.10", 4040));
assertEquals("http://192.168.1.10:4040/libresonic/stream?id=42",
StringUtil.rewriteRemoteUrl("https://localhost:4443/libresonic/stream?id=42", false, urlRedirectType, null, urlRedirectCustomUrl, "libresonic", "192.168.1.10", 4040));
assertEquals("http://sindre.libresonic.org:80/stream?id=42",
StringUtil.rewriteRemoteUrl("http://localhost:4040/stream?id=42", true, urlRedirectType, "sindre", urlRedirectCustomUrl, "", "192.168.1.10", 4040));
assertEquals("http://sindre.libresonic.org:80/stream?id=42",
StringUtil.rewriteRemoteUrl("http://localhost:4040/libresonic/stream?id=42", true, urlRedirectType, "sindre", urlRedirectCustomUrl, "libresonic", "192.168.1.10", 4040));
assertEquals("http://sindre.libresonic.org:80/stream?id=42",
StringUtil.rewriteRemoteUrl("https://localhost:4443/stream?id=42", true, urlRedirectType, "sindre", urlRedirectCustomUrl, "", "192.168.1.10", 4040));
assertEquals("http://sindre.libresonic.org:80/stream?id=42",
StringUtil.rewriteRemoteUrl("https://localhost:4443/libresonic/stream?id=42", true, urlRedirectType, "sindre", urlRedirectCustomUrl, "libresonic", "192.168.1.10", 4040));
}
}