From 3d64699c2ff9051341f9e9ce7e4b0e258a4fddaf Mon Sep 17 00:00:00 2001
From: Kayden Tebau <me@nullob.si>
Date: Tue, 18 Oct 2022 09:46:54 -0700
Subject: [PATCH] Fix loose carriage return causing issues

---
 lib/unix_dog/Controller/Account.pm  | 6 ++++--
 lib/unix_dog/Controller/Register.pm | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/unix_dog/Controller/Account.pm b/lib/unix_dog/Controller/Account.pm
index 23e1b1c..53a4eb4 100644
--- a/lib/unix_dog/Controller/Account.pm
+++ b/lib/unix_dog/Controller/Account.pm
@@ -15,7 +15,7 @@ sub update_account($self) {
     $v->required('loginShell')->size(1,64);
     $v->optional('roomNumber');
     $v->optional('telNum');
-    $v->required('sshKeys')->size(1,4096);
+    $v->required('sshKeys')->size(1,8192);
 
     $v->optional('newPasswd');
     $v->required('curPasswd')->size(1,512);
@@ -28,7 +28,9 @@ sub update_account($self) {
     my $loginShell = $self->param('loginShell');
     my $roomNumber = $self->param('roomNumber');
     my $telNum = $self->param('telNum');
-    my @sshKeys = split "\n", $self->param('sshKeys');
+    my $sshKeys = $self->param('sshKeys');
+    $sshKeys =~ s/\r//;
+    my @sshKeys = split "\n", $sshKeys;
 
     my $curPasswd = $self->param('curPasswd');
     my $newPasswd = $self->param('newPasswd');
diff --git a/lib/unix_dog/Controller/Register.pm b/lib/unix_dog/Controller/Register.pm
index e0f258b..86a6fa9 100644
--- a/lib/unix_dog/Controller/Register.pm
+++ b/lib/unix_dog/Controller/Register.pm
@@ -21,13 +21,14 @@ sub register($self) {
     $v->required('username', 'trim')->size(1,32)->like(qr/^([a-z_][a-z0-9_-]*[\$]?)$/);
     $v->required('password')->size(8, 256);
     $v->required('email')->size(1, 512);
-    $v->required('pubkey')->size(1,4096);
+    $v->required('pubkey')->size(1,8192);
     $v->required('bio')->size(1, 2048);
 
     my $username = $self->param('username');
     my $password = $self->param('password');
     my $email = $self->param('email');
     my $pubkeys = $self->param('pubkey');
+    $pubkeys =~ s/\r//;
     my $bio = $self->param('bio');
     my $fromIP = $self->tx->remote_address;