Skip to content

Commit

Permalink
add wireguard
Browse files Browse the repository at this point in the history
  • Loading branch information
@aep
aep committed Mar 4, 2021
1 parent cf347ea commit 6ea46e6
Show file tree
Hide file tree
Showing 3 changed files with 94 additions and 25 deletions.
2 changes: 1 addition & 1 deletion doopenwrt.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ cp -a target/gen target/c/ target/make/ target/release ~/proj/captif/openwrt/pac

cd ~/proj/captif/openwrt/
make V=s CONFIG_DEBUG=y -j20 package/devguard/genesis/{clean,compile}
scp ~/proj/captif/openwrt/build_dir/target-mips_24kc_musl/genesis-0.13/genesis [email protected].187:/tmp/genesis
scp ~/proj/captif/openwrt/build_dir/target-mips_24kc_musl/genesis-0.13/genesis [email protected].246:/tmp/genesis

12 changes: 7 additions & 5 deletions src/ast.zz
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,20 +43,22 @@ export struct WifiInterface @json::from() {
WifiAuth auth;
}

export type StringList @json::from() = vec::Vec[vec::item = char];
export type RouteList @json::from() = vec::Vec[vec::item = slice::Slice];

export struct WireguardPeer @json::from() {
slice::Slice public_key;
slice::Slice endpoint;
bool autoroute;
slice::Slice psk;
u32 keepalive;
StringList routes;
RouteList routes;
}

export type WireguardPeerList @json::from() = vec::Vec[vec::item = WireguardPeer];

export struct WireguardInterface @json::from() {
slice::Slice private_key;
StringList peers;
slice::Slice private_key;
WireguardPeerList peers;
}

export enum Dhcp @json::from() {
Expand All @@ -79,7 +81,7 @@ export struct Interface @json::from() {
IpVec mut ipaddrs;
IpVec mut dns;

WireguardInterface * wg;
WireguardInterface * wireguard;
WifiInterface * wifi;
}
export type InterfaceMap @json::from() = map::Map[map::key=char, map::val=Interface, +0];
Expand Down
105 changes: 86 additions & 19 deletions src/openwrt.zz
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,32 +107,99 @@ pub fn emit(ast::Genesis *gst, bool notify_openwrt)
}
}
ast::InterfaceClass::wireguard => {
fprintf(fo, " option proto 'wireguard'\n");
fprintf(fo, " option disabled '0'\n");


if iff->wireguard != 0 {
static_attest(safe(iff->wireguard));
static_attest(slice::integrity(&iff->wireguard->private_key));
fprintf(fo, " option private_key '%.*s'\n",
(int)iff->wireguard->private_key.size, iff->wireguard->private_key.mem);
}

static_attest(vec::integrity(&iff->ipaddrs));
for usize mut i = 0; i < iff->ipaddrs.count ; i++ {
let sl = unsafe<slice::slice::Slice>(*(slice::slice::Slice*)iff->ipaddrs.items[i].mem);
static_attest(slice::integrity(&sl));
fprintf(fo, " list addresses '%.*s'\n", (int)sl.size, sl.mem);
}


static_attest(vec::integrity(&iff->wireguard->peers));
for usize mut i = 0; i < iff->wireguard->peers.count ; i++ {
let peer = (ast::WireguardPeer*)iff->wireguard->peers.items[i].mem;
static_attest(safe(peer));

fprintf(fo, "\nconfig 'wireguard_%.*s'\n", (int)it.key.size, it.key.mem);

fprintf(fo, " option public_key '%.*s'\n",
(int)peer->public_key.size, peer->public_key.mem);

if peer->autoroute {
fprintf(fo, " option route_allowed_ips '1'\n");
} else {
fprintf(fo, " option route_allowed_ips '0'\n");
}

if peer->psk.size > 0 {
fprintf(fo, " option preshared_key '%.*s'\n",
(int)peer->psk.size, peer->psk.mem);
}

if peer->keepalive !=0 {
fprintf(fo, " option persistent_keepalive '%d'\n", (int)peer->keepalive);
}

static_attest(slice::integrity(&peer->endpoint));

new+500 mut xe = buffer::from_slice(peer->endpoint);
new+500 mut justip = buffer::make();
usize mut it = 0;
if xe.split(':', &it, &justip) {
fprintf(fo, " option endpoint_host '%s'\n", justip.mem);
new+100 mut port = buffer::make();
xe.split(':', &it, &port);
fprintf(fo, " option endpoint_port '%s'\n", port.mem);
}

for usize mut i2 = 0; i2 < peer->routes.count ; i2++ {
let sl = unsafe<slice::slice::Slice>(*(slice::slice::Slice*)peer->routes.items[i2].mem);
static_attest(slice::integrity(&sl));
fprintf(fo, " list allowed_ips '%.*s'\n", sl.size, sl.mem);
}
}
}
}

static_attest(vec::integrity(&iff->ipaddrs));
if iff->ipaddrs.count > 0 {
let sl = unsafe<slice::slice::Slice>(*(slice::slice::Slice*)iff->ipaddrs.items[0].mem);
static_attest(slice::integrity(&sl));

new+500 mut xe = buffer::from_slice(sl);
new+500 mut justip = buffer::make();
usize mut it = 0;
if xe.split('/', &it, &justip) {
fprintf(fo, " option ipaddr '%s'\n", justip.mem);
new+100 mut mask = buffer::make();
xe.split('/', &it, &mask);
usize maskc = (usize)(atoi(mask.mem));
if iff->class != ast::InterfaceClass::wireguard {

u8 mut maskbits[4] = {0};
for (usize mut i = 0; i < maskc && i < 32; i++) {
maskbits[i / 8] |= (u8)(1 << (i % 8));
}
static_attest(vec::integrity(&iff->ipaddrs));
if iff->ipaddrs.count > 0 {
let sl = unsafe<slice::slice::Slice>(*(slice::slice::Slice*)iff->ipaddrs.items[0].mem);
static_attest(slice::integrity(&sl));

new+500 mut xe = buffer::from_slice(sl);
new+500 mut justip = buffer::make();
usize mut it = 0;
if xe.split('/', &it, &justip) {
fprintf(fo, " option ipaddr '%s'\n", justip.mem);
new+100 mut mask = buffer::make();
xe.split('/', &it, &mask);
usize maskc = (usize)(atoi(mask.mem));

u8 mut maskbits[4] = {0};
for (usize mut i = 0; i < maskc && i < 32; i++) {
maskbits[i / 8] |= (u8)(1 << (i % 8));
}

fprintf(fo, " option netmask '%d.%d.%d.%d'\n", maskbits[0],maskbits[1], maskbits[2], maskbits[3]);
fprintf(fo, " option netmask '%d.%d.%d.%d'\n", maskbits[0],maskbits[1], maskbits[2], maskbits[3]);

} else {
fprintf(fo, " option ipaddr '%.*s'\n", (int)sl.size, sl.mem);
}

} else {
fprintf(fo, " option ipaddr '%.*s'\n", (int)sl.size, sl.mem);
}

}
Expand Down

0 comments on commit 6ea46e6

Please sign in to comment.