diff --git a/htroot/SettingsAck_p.java b/htroot/SettingsAck_p.java index ca31a6748..4eed26a48 100644 --- a/htroot/SettingsAck_p.java +++ b/htroot/SettingsAck_p.java @@ -35,6 +35,7 @@ import java.util.regex.PatternSyntaxException; import net.yacy.cora.order.Digest; import net.yacy.cora.protocol.RequestHeader; +import net.yacy.data.TransactionManager; import net.yacy.http.InetPathAccessHandler; import net.yacy.kelondro.util.Formatter; import net.yacy.peers.Network; @@ -66,6 +67,9 @@ public class SettingsAck_p { prop.put("info", "1");//no information submitted return prop; } + + /* Check this is a valid transaction */ + TransactionManager.checkPostTransaction(header, post); // admin password if (post.containsKey("adminaccount")) { diff --git a/htroot/Settings_Crawler.inc b/htroot/Settings_Crawler.inc index c451e046b..cd0b27433 100644 --- a/htroot/Settings_Crawler.inc +++ b/htroot/Settings_Crawler.inc @@ -1,4 +1,5 @@
+
Crawler Settings diff --git a/htroot/Settings_Debug.inc b/htroot/Settings_Debug.inc index 750c7bf3f..0d0627bb9 100644 --- a/htroot/Settings_Debug.inc +++ b/htroot/Settings_Debug.inc @@ -5,6 +5,7 @@ +
Solr communication diff --git a/htroot/Settings_MessageForwarding.inc b/htroot/Settings_MessageForwarding.inc index c0634d39c..707e39761 100644 --- a/htroot/Settings_MessageForwarding.inc +++ b/htroot/Settings_MessageForwarding.inc @@ -1,4 +1,5 @@ +
Message Forwarding

With this settings you can activate or deactivate forwarding of yacy-messages via email.

Generic Crawler Settings:

diff --git a/htroot/Settings_Proxy.inc b/htroot/Settings_Proxy.inc index 2f02d1401..a0e655595 100644 --- a/htroot/Settings_Proxy.inc +++ b/htroot/Settings_Proxy.inc @@ -1,4 +1,5 @@ +
Remote Proxy (optional)

YaCy can use another proxy to connect to the internet. You can enter the address for the remote proxy here:

diff --git a/htroot/Settings_ProxyAccess.inc b/htroot/Settings_ProxyAccess.inc index db8c97178..fe5d1f274 100644 --- a/htroot/Settings_ProxyAccess.inc +++ b/htroot/Settings_ProxyAccess.inc @@ -1,4 +1,5 @@ +
Proxy Settings
@@ -38,6 +39,7 @@ +
Proxy Access Settings

These settings configure the access method to your own http proxy and server. diff --git a/htroot/Settings_Referrer.inc b/htroot/Settings_Referrer.inc index 2c54b55cf..c7a0abb45 100644 --- a/htroot/Settings_Referrer.inc +++ b/htroot/Settings_Referrer.inc @@ -13,6 +13,7 @@ Visited websites can process this information as they whish, so this can become

+
Global policy diff --git a/htroot/Settings_Seed.inc b/htroot/Settings_Seed.inc index aef5d71ae..c48378237 100644 --- a/htroot/Settings_Seed.inc +++ b/htroot/Settings_Seed.inc @@ -11,6 +11,7 @@ but only if there have been changes to the seed-list.

+
diff --git a/htroot/Settings_Seed_UploadFile.inc b/htroot/Settings_Seed_UploadFile.inc index c611073db..4b34a3a86 100644 --- a/htroot/Settings_Seed_UploadFile.inc +++ b/htroot/Settings_Seed_UploadFile.inc @@ -2,6 +2,7 @@

Store into filesystem:

You must configure this if you want to store the seed-list file onto the file system.

+
:
diff --git a/htroot/Settings_Seed_UploadFtp.inc b/htroot/Settings_Seed_UploadFtp.inc index 3261f7cef..bbde5bbb9 100644 --- a/htroot/Settings_Seed_UploadFtp.inc +++ b/htroot/Settings_Seed_UploadFtp.inc @@ -7,6 +7,7 @@ but only if there had been changes to the seed-list.

+
diff --git a/htroot/Settings_Seed_UploadScp.inc b/htroot/Settings_Seed_UploadScp.inc index fd0cea50f..e895c936a 100644 --- a/htroot/Settings_Seed_UploadScp.inc +++ b/htroot/Settings_Seed_UploadScp.inc @@ -2,6 +2,7 @@

Uploading via SCP:

This is the account for a server where you are able to login via ssh.

+
:
diff --git a/htroot/Settings_ServerAccess.inc b/htroot/Settings_ServerAccess.inc index 6a97978ed..4950ac93d 100644 --- a/htroot/Settings_ServerAccess.inc +++ b/htroot/Settings_ServerAccess.inc @@ -1,4 +1,5 @@ +
Server Access Settings
:
diff --git a/htroot/Settings_UrlProxyAccess.inc b/htroot/Settings_UrlProxyAccess.inc index fa357140b..747543215 100644 --- a/htroot/Settings_UrlProxyAccess.inc +++ b/htroot/Settings_UrlProxyAccess.inc @@ -1,5 +1,6 @@ +
URL Proxy Settings

With this settings you can activate or deactivate URL proxy. diff --git a/htroot/Settings_p.java b/htroot/Settings_p.java index 25b0fb837..20d853896 100644 --- a/htroot/Settings_p.java +++ b/htroot/Settings_p.java @@ -26,6 +26,7 @@ import java.util.HashMap; import java.util.Iterator; import net.yacy.cora.protocol.RequestHeader; +import net.yacy.data.TransactionManager; import net.yacy.http.ReferrerPolicy; import net.yacy.peers.Network; import net.yacy.peers.Seed; @@ -47,6 +48,9 @@ public final class Settings_p { final String page = (post == null) ? "general" : post.get("page", "general"); + /* Acquire a transaction token for the next possible POST form submission */ + prop.put(TransactionManager.TRANSACTION_TOKEN_PARAM, TransactionManager.getTransactionToken(header, "/SettingsAck_p.html")); + if (page.equals("ProxyAccess")) { prop.put("settingsTables", "Settings_ProxyAccess.inc"); }