-Added REST per-endpoint permissions.

-Added REST endpoint "/v2/server/restart".
-Added REST endpoint "/v2/server/reload".
-Added REST endpoint "/v3/server/rawcmd", will output all returned lines as an array instead.
-Added "uptime", "serverpassword", "rules/ServerSideInventory" fields to REST endpoint "/v2/server/status".
-REST requests are now logged.
-Endpoint "/v2/server/rawcmd" does now check whether the user has the sufficient permission to execute the command.
-Fixed Config.EnableTokenEndpointAuthentication not working properly before.
-Removed obsolete "api" permission (only "restapi" now).

TShockAPI/Rest/RestCommand.cs

@@ -16,8 +16,9 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 using System.Linq;
-using System.Text.RegularExpressions;
-
+using System.Text.RegularExpressions;
+using HttpServer;
+
 namespace Rests
 {
 	public class RestCommand
@@ -26,8 +27,10 @@ namespace Rests
 		public string UriTemplate { get; protected set; }
 		public string UriVerbMatch { get; protected set; }
 		public string[] UriVerbs { get; protected set; }
-		public RestCommandD Callback { get; protected set; }
-		public bool RequiresToken { get; set; }
+		public virtual bool RequiresToken { get { return false; } }
+		public bool DoLog { get; set; }
+
+		private RestCommandD callback;
 
 		/// <summary>
 		/// 
@@ -42,8 +45,8 @@ namespace Rests
 			UriVerbMatch = string.Format("^{0}$", string.Join("([^/]*)", Regex.Split(uritemplate, "\\{[^\\{\\}]*\\}")));
 			var matches = Regex.Matches(uritemplate, "\\{([^\\{\\}]*)\\}");
 			UriVerbs = (from Match match in matches select match.Groups[1].Value).ToArray();
-			Callback = callback;
-			RequiresToken = true;
+			this.callback = callback;
+			DoLog = true;
 		}
 
 		/// <summary>
@@ -59,6 +62,44 @@ namespace Rests
 		public bool HasVerbs
 		{
 			get { return UriVerbs.Length > 0; }
+		}
+
+		public virtual object Execute(RestVerbs verbs, IParameterCollection parameters)
+		{
+			return callback(verbs, parameters);
 		}
+	}
+
+	public class SecureRestCommand: RestCommand
+	{
+		public override bool RequiresToken { get { return true; } }
+		public string[] Permissions { get; set; }
+
+		private SecureRestCommandD callback;
+
+		public SecureRestCommand(string name, string uritemplate, SecureRestCommandD callback, params string[] permissions)
+			: base(name, uritemplate, null)
+		{
+			this.callback = callback;
+			Permissions = permissions;
+		}
+
+		public SecureRestCommand(string uritemplate, SecureRestCommandD callback, params string[] permissions)
+			: this(string.Empty, uritemplate, callback, permissions)
+		{
+		}
+
+		public override object Execute(RestVerbs verbs, IParameterCollection parameters)
+		{
+			return new RestObject("401") { Error = "Not authorized. The specified API endpoint requires a token." };
+		}
+
+		public object Execute(RestVerbs verbs, IParameterCollection parameters, SecureRest.TokenData tokenData)
+		{
+			if (tokenData.Equals(SecureRest.TokenData.None))
+				return new RestObject("401") { Error = "Not authorized. The specified API endpoint requires a token." };
+
+			return callback(verbs, parameters, tokenData);
+		}
 	}
 }