elias/ark-ac-server-tools
1
0
Fork 0
mirror of https://github.com/eliasstepanik/ark-ac-server-tools.git synced 2026-01-12 10:58:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #342 from klightspeed/1.5-dev#warnemptyadminpass

Browse Source 
Warn when ServerAdminPassword is empty
This commit is contained in:
Fez Vrasta 2015-12-26 08:11:48 +01:00
commit cdb94b1359
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/arkmanager
View File

@ -253,6 +253,14 @@ getQueryPort(){
# Execute RCON command
#
rconcmd() {
local adminpass="$(getAdminPassword)"
if [ -z "$adminpass" ]; then
echo "ServerAdminPassword is empty - unable to execute RCON command"
return 1
elif [[ "$adminpass" =~ [?\177-\377] ]]; then
echo "ServerAdminPassword contains invalid characters"
return 1
fi
perl -MSocket -e '
sub sendpkt {
my ($sock, $reqid, $reqtype, $body) = @_;
@ -263,7 +271,8 @@ rconcmd() {
sub recvpkt {
my ($sock) = @_;
my $data = "";
recv($sock, $data, 12, 0);
recv($sock, $data, 12, 0) or die "Error receiving response from server"
die "Empty response" if len($data) == 0;
my ($pktlen, $resid, $restype) = unpack("VVV", $data);
recv($sock, $data, $pktlen - 8, 0);
return ($resid, $restype, substr($data, 0, $pktlen - 10));
@ -289,7 +298,7 @@ rconcmd() {
sendpkt($socket, 2, 2, $command);
my ($resid, $restype, $rcvbody) = recvpkt($socket);
print $rcvbody, "\n";
' "$(getRconPort)" "${ark_MultiHome:-127.0.0.1}" "$(getAdminPassword)" "$1"
' "$(getRconPort)" "${ark_MultiHome:-127.0.0.1}" "$adminpass" "$1"
}
#