Skip to content

Remove downloading plugins from clearnet URL: try FreenetURI instead #1132

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ArneBab wants to merge 3 commits into
base: next
Choose a base branch
from
Open

Remove downloading plugins from clearnet URL: try FreenetURI instead #1132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd2fb98
Remove downloading plugins from clearnet URL: try FreenetURI instead
ArneBab May 9, 2026
5f113f4
Deprecate startPluginURL
ArneBab May 9, 2026
bab7630
Fix: only check for starting with root.name if the name isn’t empty
ArneBab May 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/freenet/clients/fcp/LoadPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@ public void run() {
pi = node.getPluginManager().startPluginFreenet(pluginURL, store);
break;
case TYPENAME_URL:
pi = node.getPluginManager().startPluginURL(pluginURL, store);
// only support Hyphanet URLs, because others are a privacy risk
pi = node.getPluginManager().startPluginFreenet(pluginURL, store);
break;
default:
Logger.error(this, "This should really not happen!", new Exception("FIXME"));
Expand Down
18 changes: 15 additions & 3 deletions src/freenet/clients/http/PproxyToadlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Objects;
import java.util.Set;
import java.util.SortedMap;
import java.util.TreeMap;
Expand All @@ -26,9 +27,11 @@
import freenet.pluginmanager.DownloadPluginHTTPException;
import freenet.pluginmanager.NotFoundPluginHTTPException;
import freenet.pluginmanager.OfficialPlugins.OfficialPluginDescription;
import freenet.pluginmanager.PluginDownLoaderFile;
import freenet.pluginmanager.PluginHTTPException;
import freenet.pluginmanager.PluginInfoWrapper;
import freenet.pluginmanager.PluginManager;
import freenet.pluginmanager.PluginNotFoundException;
import freenet.pluginmanager.RedirectPluginHTTPException;
import freenet.pluginmanager.PluginManager.PluginProgress;
import freenet.support.HTMLNode;
Expand Down Expand Up @@ -156,10 +159,19 @@ public void run() {
node.getExecutor().execute(new Runnable() {
@Override
public void run() {
if (fileonly)
if (fileonly) {
pm.startPluginFile(pluginName, true);
else
pm.startPluginURL(pluginName, true);
} else {
// first check whether it is a file
for(File f : File.listRoots()) {
if(!Objects.equals(f.getName(), "") && pluginName.startsWith(f.getName())
|| pluginName.startsWith(f.getPath())) {
pm.startPluginFile(pluginName, true);
return;
}
}
pm.startPluginFreenet(pluginName, true);
}
}
});

Expand Down
3 changes: 2 additions & 1 deletion src/freenet/node/TextModeClientInterface.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -939,7 +939,8 @@ else if(uline.startsWith("PUTSSKDIR:")) {
n.getPluginManager().startPluginFile(name, true);
} else if(uline.startsWith("PLUGLOAD:U:")) {
String name = line.substring("PLUGLOAD:U:".length()).trim();
n.getPluginManager().startPluginURL(name, true);
// only support Hyphanet URLs, because others are a privacy risk
n.getPluginManager().startPluginFreenet(name, true);
} else if(uline.startsWith("PLUGLOAD:K:")) {
String name = line.substring("PLUGLOAD:K:".length()).trim();
n.getPluginManager().startPluginFreenet(name, true);
Expand Down
117 changes: 0 additions & 117 deletions src/freenet/pluginmanager/PluginDownLoaderURL.java
View file
Open in desktop

This file was deleted.

11 changes: 9 additions & 2 deletions src/freenet/pluginmanager/PluginManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,9 @@ public PluginInfoWrapper startPluginAuto(final String pluginname, boolean store)
}
}

return startPluginURL(pluginname, store);
Logger.debug(this, "Plugin only has a clearnet URL source. Not loading it for safeties sake: " + pluginname);
// causes a NoSuchPlugin error in ReloadPlugin.java
return null;
}

public PluginInfoWrapper startPluginOfficial(final String pluginname, boolean store) {
Expand Down Expand Up @@ -359,8 +361,13 @@ public PluginInfoWrapper startPluginFile(final String filename, boolean store) {
return realStartPlugin(new PluginDownLoaderFile(), filename, store, false);
}

/**
* @deprecated this is unused -- keeping it to avoid removing public API that may be in use by plugins
*/
@Deprecated
public PluginInfoWrapper startPluginURL(final String filename, boolean store) {
return realStartPlugin(new PluginDownLoaderURL(), filename, store, false);
Logger.warning(this, "Tried to download plugin from clearnet URL, but that is removed. Interpreting as FreenetURI instead.");
return startPluginFreenet(filename, store);
}

public PluginInfoWrapper startPluginFreenet(final String filename, boolean store) {
Expand Down