[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: VPN Patch for botnow
[Thread Prev] | [Thread Next]
- Subject: Re: VPN Patch for botnow
- From: miniontoby@xxxxxxxxxx
- Date: Thu, 22 Jun 2023 15:59:40 -0000
- To: codeforce@xxxxxxxxxx
Hey,
Here is a patch of my patch for botnow for the VPN module!
(this is becuase I forgot some files and did some stuff wrongly...)
Greets Miniontoby
diff --git a/VPN.pm b/VPN.pm
index 1d5af6d..2bbb02f 100644
--- a/VPN.pm
+++ b/VPN.pm
@@ -6,28 +6,126 @@ use strict;
use warnings;
use OpenBSD::Pledge;
use OpenBSD::Unveil;
+require "DNS.pm";
+require "SQLite.pm";
+
+my %conf = %main::conf;
+my $chans = $conf{chans};
+my $teamchans = $conf{teamchans};
+my @teamchans = split /[,\s]+/m, $teamchans;
+my $staff = $conf{staff};
+my $expires = $conf{expires};
+my $ikedconf = $conf{ikedconf};
+# File containing IRC networks
+my $netpath = "networks";
+my @networks;
+
+main::cbind("pub", "-", "vpn", \&vpn);
+main::cbind("msg", "-", "vpn", \&vpn);
sub init {
+ unveil("/usr/bin/rcctl", "rx") or die "Unable to unveil $!";
+ unveil($ikedconf, "crx") or die "Unable to unveil $!";
+}
+
+sub vpn {
+ my ($bot, $nick, $host, $hand, @args) = @_;
+ my ($chan, $text);
+ if (@args == 2) {
+ ($chan, $text) = ($args[0], $args[1]);
+ } else { $text = $args[0]; }
+ my $hostmask = "$nick!$host";
+ if (defined($chan) && $chans =~ /$chan/) {
+ main::putserv($bot, "PRIVMSG $chan :$nick: Please check
private message");
+ }
+ if ($text =~ /^$/) {
+ main::putserv($bot, "PRIVMSG $nick :Type !help for new
instructions");
+ foreach my $chan (@teamchans) {
+ main::putservlocalnet($bot, "PRIVMSG $chan
:$staff: Help *$nick* on network
".$bot->{name});
+ }
+ return;
+ }
+ my @rows = SQLite::selectrows("irc", "nick", $nick);
+ foreach my $row (@rows) {
+ my $password = SQLite::get("vpn", "ircid", $row->{id},
"password");
+ if (defined($password)) {
+ main::putserv($bot, "PRIVMSG $nick :Sorry, only
one account per person. Please
contact staff if you need help.");
+ return;
+ }
+ }
+ if ($text =~ /^captcha\s+([[:alnum:]]+)/) {
+ my $text = $1;
+ my $ircid = SQLite::id("irc", "nick", $nick, $expires);
+ if (!defined($ircid)) { die "undefined ircid"; }
+ my $captcha = SQLite::get("vpn", "ircid", $ircid,
"captcha");
+ if ($text ne $captcha) {
+ main::putserv($bot, "PRIVMSG $nick :Wrong
captcha. To get a new captcha, type
!vpn <username> <email>");
+ return;
+ }
+
+ my $pass = Hash::newpass();
+ chomp(my $encrypted = `encrypt $pass`);
+ my $username = SQLite::get("vpn", "ircid", $ircid,
"username");
+ my $email = SQLite::get("vpn", "ircid", $ircid, "email");
+ my $version = SQLite::get("vpn", "ircid", $ircid,
"version");
+ SQLite::set("vpn", "ircid", $ircid, "password", $encrypted);
+
+ createvpn($username, $pass);
+ foreach my $chan (@teamchans) {
+ main::putservlocalnet($bot, "PRIVMSG $chan
:$staff: vpn created for $username");
+ }
+ my $msg = <<"EOF";
+Your vpn account has been created! Username: $username with password: $pass
+Our official support channel is #vpn. To connect, please follow these
instructions:
https://wiki.ircnow.org/Vpn/Vpn
+EOF
+ main::putserv($bot, "PRIVMSG $nick :$msg");
+ } elsif ($text =~ /^([[:alnum:]]+)\s+([[:ascii:]]+)/) {
+ my ($username, $email) = ($1, $2);
+ if ($staff !~ /$nick/) {
+ return;
+ }
+ my @users = col($ikedconf);
+ my @matches = grep(/^$username$/i, @users);
+ if (scalar(@matches) > 0) {
+ main::putserv($bot, "PRIVMSG $nick :Sorry,
username taken. Please choose another
username, or contact staff for help.");
+ return;
+ }
+
+ my $captcha = int(rand(999));
+ my $ircid = int(rand(2147483647));
+ SQLite::set("irc", "id", $ircid, "localtime", time());
+ SQLite::set("irc", "id", $ircid, "date", main::date());
+ SQLite::set("irc", "id", $ircid, "hostmask", $hostmask);
+ SQLite::set("irc", "id", $ircid, "nick", $nick);
+ SQLite::set("vpn", "ircid", $ircid, "username", $username);
+ SQLite::set("vpn", "ircid", $ircid, "email", $email);
+ SQLite::set("vpn", "ircid", $ircid, "captcha", $captcha);
+ main::whois($bot->{sock}, $nick);
+ main::ctcp($bot->{sock}, $nick);
+ main::putserv($bot, "PRIVMSG $nick :".`figlet $captcha`);
+ # main::putserv($bot, "PRIVMSG $nick
:$captchaURL".encode_base64($captcha));
+ main::putserv($bot, "PRIVMSG $nick :Type !vpn captcha
<text>");
+ foreach my $chan (@teamchans) {
+ main::putservlocalnet($bot, "PRIVMSG $chan
:$nick\'s captcha on $bot->{name} is
$captcha");
+ }
+ }
+}
+sub createvpn {
+ my ($username, $password) = @_;
+ `doas sh -c 'echo "user $username $password" >> /etc/iked.conf'`;
+ `doas rcctl reload iked`;
+}
+
+sub col {
+ my ($filename) = @_;
+ my @rows = main::readarray($filename);
+ my @results;
+ foreach my $row (@rows) {
+ if ($row =~ /^user (.*?) /) {
+ push(@results, $1);
+ }
+ }
+ return @results;
}
-# if ($reply =~ /^!vpn (.*) ([-_0-9a-zA-Z]+)$/i) {
-# my $ircnick = $1;
-# my $newnick = $2;
-# if ($staff !~ /$sender/) {
-# return;
-# }
-# my $password = newpass();
-# createvpn($password, $newnick);
-# sendmsg($bot, $sender, "vpn created for $newnick");
-#my $msg = <<"EOF";
-#Your vpn account has been created! Username: $newnick with password:
$password
-#Our official support channel is #vpn. To connect, please follow these
instructions: https://ircnow.org/kb/doku.php?id=vpn:vpn .
-#EOF
-# sendmsg($bot, $ircnick, $msg);
-# }
-#sub createvpn {
-# my ($password, $username) = @_;
-# `doas sh -c 'echo "user '$username' '$password'" >>
/etc/iked.conf'`;
-# `doas rcctl reload iked`;
-#}
1; # MUST BE LAST STATEMENT IN FILE
diff --git a/botnow b/botnow
index 7a377ea..45f247a 100755
--- a/botnow
+++ b/botnow
@@ -163,6 +163,9 @@ $conf{zncdir} = $conf{zncdir} || "/home/znc/home/znc";
# Network Interface Config File
$conf{hostnameif} = $conf{hostnameif} || "/etc/hostname.vio0";
+# Iked Config File
+$conf{ikedconf} = $conf{ikedconf} || "/etc/iked.conf";
+
# Verbosity: 0 (no errors), 1 (errors), 2 (warnings), 3 (diagnostic)
use constant {
NONE => 0,
diff --git a/botnow.conf.example b/botnow.conf.example
index 787101c..14f89b9 100644
--- a/botnow.conf.example
+++ b/botnow.conf.example
@@ -90,5 +90,8 @@ die = You did not configure botnow.conf!
#Network Interface Config File
#hostnameif = /etc/hostname.vio0
+#Iked conf file
+#ikedconf = /etc/iked.conf
+
#Verbosity: NONE, ERRORS, WARNINGS, ALL
#verbose = ERRORS
diff --git a/install b/install
index ec741dd..31b405e 100755
--- a/install
+++ b/install
@@ -11,6 +11,7 @@ HTTPDCONF="/etc/httpd.conf"
ACMECONF="/etc/acme-client.conf"
MAILDIR="/etc/mail/"
HOSTNAMEIF="/etc/hostname.vio0"
+IKEDCONF="/etc/iked.conf"
pkg_add figlet-2.2.5 php-8.0.8 php-sqlite p5-DBI p5-DBD-SQLite sqlite3
p5-Class-DBI-SQLite
cc -o blowfish.o blowfish.c
@@ -37,12 +38,14 @@ usermod -G wheel ${USERNAME}
chown -R _nsd:daemon ${ZONES}
chmod ug+rwx ${ZONES}
chmod ug+rw ${ZONES}/*
-chmod -R g+rw ${HTTPDCONF} ${ACMECONF} ${MAILDIR}
+chmod -R g+rw ${HTTPDCONF} ${ACMECONF} ${MAILDIR}
+chgrp wheel ${IKEDCONF}
+chmod g+r ${IKEDCONF}
echo "permit nopass ${USERNAME}" >> /etc/doas.conf
usermod -G _dovecot botnow
chmod g+rw ${HOSTNAMEIF}
cp captcha.png register.php ${HTDOCS}/
-cp LICENSE README botnow botnow.conf.example BNC.pm DNS.pm Mail.pm SQLite.pm
Shell.pm table.sql Hash.pm Help.pm install networks captcha.png
register.php words
report ${HOMEDIR}/
+cp LICENSE README botnow botnow.conf.example BNC.pm DNS.pm Mail.pm SQLite.pm
Shell.pm table.sql Hash.pm Help.pm VPN.pm install networks captcha.png
register.php
words report ${HOMEDIR}/
mkdir ${HOMEDIR}/backups/
chown -R ${USERNAME}:${USERNAME} ${HOMEDIR}
chmod -R go-rx ${HOMEDIR}
diff --git a/table.sql b/table.sql
index 1b71f51..b9d4874 100644
--- a/table.sql
+++ b/table.sql
@@ -95,3 +95,15 @@ CREATE TABLE smtp (
mime VARCHAR(100),
subject VARCHAR(100)
);
+CREATE TABLE vpn (
+ id INTEGER PRIMARY KEY,
+ hashid VARCHAR(100),
+ ircid INTEGER,
+ wwwid INTEGER,
+ smtpid INTEGER,
+ username VARCHAR(32),
+ email VARCHAR(100),
+ password VARCHAR(100),
+ localtime VARCHAR(100),
+ captcha INTEGER
+);