Lfx cleanup by charliemirabile · Pull Request #44 · underground-software/singularity

charliemirabile · 2024-03-24T18:35:59Z

Since we have found a solution for running more than one independent version of the infrastructure, we no longer need to support lfx/non lfx for the mail servers. Since 326c3d6 we have not done so, but the lfx field remains in the database and in several queries. This PR removes all references to it.

theyoyojo

tbh this could have been a single commit but it's all good

Since we are moving away from this system of sharing resources a good place to start is to provide a default of false for lfx so that more places can avoid refering to it.

To make the query simpler, since lfx was always being set to 0 (False) and the default is false, it does not need to be specified.

since 326c3d6 ("orbit: remove cruft related to lfx from mail_auth") we have not needed this database query.

since we are no longer querying the LFX status of students as part of the mail auth flow, the ability to change LFX status with the -x and -y options in hyperspace are uneeded.

since the -x and -y options are no longer calling these functions, they are unused.

Since there are no callers for these functions, they (and their associated queries) are no longer needed

since lfx is always false and can no longer be printed, it does not need to be displayed when viewing the student roster.

Since there are no references to the lfx field, it does not need to be stored.

theyoyojo · 2024-03-25T23:40:31Z

PASS:

DEVEL=yes ./test.sh
+ rm -rf test email/logs/2.1711408999.1 email/mail/2.1711408999.0
+ mkdir -p test
+ chcon -R -t container_file_t email
+ DEVEL=yes
+ STAGING=
+ PORT=443
+ POP_PORT=995
+ SMTP_PORT=465
+ EMAIL_HOSTNAME=kdlp.underground.software
+ export 'DOCKER=sudo podman'
+ DOCKER='sudo podman'
+ export CONTAINER=singularity_orbit_1
+ CONTAINER=singularity_orbit_1
+ '[' '!' -z yes ']'
+ PORT=1443
+ POP_PORT=1995
+ SMTP_PORT=1465
+ EMAIL_HOSTNAME=localhost
+ export DOCKER=podman
+ DOCKER=podman
+ '[' '!' -z '' ']'
+ curl --url https://localhost:1443/register --verbose --insecure --fail --no-progress-meter --data student_id=1234
+ tee test/register_fail_no_user
+ grep 'msg = no such student'
* processing: https://localhost:1443/register
*   Trying [::1]:1443...
* Connected to localhost (::1) port 1443
* ALPN: offers h2,http/1.1
} [5 bytes data]
* TLSv1.3 (OUT), TLS handshake, Client hello (1):
} [512 bytes data]
* TLSv1.3 (IN), TLS handshake, Server hello (2):
{ [122 bytes data]
* TLSv1.3 (IN), TLS handshake, Encrypted Extensions (8):
{ [25 bytes data]
* TLSv1.3 (IN), TLS handshake, Certificate (11):
{ [1308 bytes data]
* TLSv1.3 (IN), TLS handshake, CERT verify (15):
{ [520 bytes data]
* TLSv1.3 (IN), TLS handshake, Finished (20):
{ [52 bytes data]
* TLSv1.3 (OUT), TLS change cipher, Change cipher spec (1):
} [1 bytes data]
* TLSv1.3 (OUT), TLS handshake, Finished (20):
} [52 bytes data]
* SSL connection using TLSv1.3 / TLS_AES_256_GCM_SHA384
* ALPN: server accepted http/1.1
* Server certificate:
*  subject: CN=localhost
*  start date: Mar 13 02:05:24 2024 GMT
*  expire date: Apr  6 02:05:24 2389 GMT
*  issuer: CN=localhost
*  SSL certificate verify result: self-signed certificate (18), continuing anyway.
* using HTTP/1.1
} [5 bytes data]
> POST /register HTTP/1.1
> Host: localhost:1443
> User-Agent: curl/8.2.1
> Accept: */*
> Content-Length: 15
> Content-Type: application/x-www-form-urlencoded
>
} [15 bytes data]
* TLSv1.3 (IN), TLS handshake, Newsession Ticket (4):
{ [57 bytes data]
* TLSv1.3 (IN), TLS handshake, Newsession Ticket (4):
{ [57 bytes data]
* old SSL session ID is stale, removing
{ [5 bytes data]
< HTTP/1.1 200 OK
< Server: nginx
< Date: Mon, 25 Mar 2024 23:40:03 GMT
< Content-Type: text/html
< Transfer-Encoding: chunked
< Connection: keep-alive
< Set-Cookie: auth=
< Set-Cookie: auth=
<
{ [1177 bytes data]
* Connection #0 to host localhost left intact
        <code>msg = no such student</code><br>
+ tee test/login_fail_no_user
+ curl --url https://localhost:1443/login --verbose --insecure --no-progress-meter --data 'username=user&password=pass'
+ grep 'msg = authentication failure'
* processing: https://localhost:1443/login
*   Trying [::1]:1443...
* Connected to localhost (::1) port 1443
* ALPN: offers h2,http/1.1
} [5 bytes data]
* TLSv1.3 (OUT), TLS handshake, Client hello (1):
} [512 bytes data]
* TLSv1.3 (IN), TLS handshake, Server hello (2):
{ [122 bytes data]
* TLSv1.3 (IN), TLS handshake, Encrypted Extensions (8):
{ [25 bytes data]
* TLSv1.3 (IN), TLS handshake, Certificate (11):
{ [1308 bytes data]
* TLSv1.3 (IN), TLS handshake, CERT verify (15):
{ [520 bytes data]
* TLSv1.3 (IN), TLS handshake, Finished (20):
{ [52 bytes data]
* TLSv1.3 (OUT), TLS change cipher, Change cipher spec (1):
} [1 bytes data]
* TLSv1.3 (OUT), TLS handshake, Finished (20):
} [52 bytes data]
* SSL connection using TLSv1.3 / TLS_AES_256_GCM_SHA384
* ALPN: server accepted http/1.1
* Server certificate:
*  subject: CN=localhost
*  start date: Mar 13 02:05:24 2024 GMT
*  expire date: Apr  6 02:05:24 2389 GMT
*  issuer: CN=localhost
*  SSL certificate verify result: self-signed certificate (18), continuing anyway.
* using HTTP/1.1
} [5 bytes data]
> POST /login HTTP/1.1
> Host: localhost:1443
> User-Agent: curl/8.2.1
> Accept: */*
> Content-Length: 27
> Content-Type: application/x-www-form-urlencoded
>
} [27 bytes data]
* TLSv1.3 (IN), TLS handshake, Newsession Ticket (4):
{ [57 bytes data]
* TLSv1.3 (IN), TLS handshake, Newsession Ticket (4):
{ [57 bytes data]
* old SSL session ID is stale, removing
{ [5 bytes data]
< HTTP/1.1 200 OK
< Server: nginx
< Date: Mon, 25 Mar 2024 23:40:03 GMT
< Content-Type: text/html
< Transfer-Encoding: chunked
< Connection: keep-alive
< Set-Cookie: auth=
< Set-Cookie: auth=
< Set-Cookie: auth=
< Set-Cookie: auth=
<
{ [1382 bytes data]
* Connection #0 to host localhost left intact
        <code>msg = authentication failure</code><br>
+ orbit/warpdrive.sh -u user -p pass -i 1234 -n
+ tee test/create_user
+ grep 'credentials(username: user, password:pass)'
credentials(username: user, password:pass)
+ curl --url https://localhost:1443/register --verbose --insecure --fail --no-progress-meter --data student_id=123
+ tee test/register_fail_wrong
+ grep 'msg = no such student'
* processing: https://localhost:1443/register
*   Trying [::1]:1443...
* Connected to localhost (::1) port 1443
* ALPN: offers h2,http/1.1
} [5 bytes data]
* TLSv1.3 (OUT), TLS handshake, Client hello (1):
} [512 bytes data]
* TLSv1.3 (IN), TLS handshake, Server hello (2):
{ [122 bytes data]
* TLSv1.3 (IN), TLS handshake, Encrypted Extensions (8):
{ [25 bytes data]
* TLSv1.3 (IN), TLS handshake, Certificate (11):
{ [1308 bytes data]
* TLSv1.3 (IN), TLS handshake, CERT verify (15):
{ [520 bytes data]
* TLSv1.3 (IN), TLS handshake, Finished (20):
{ [52 bytes data]
* TLSv1.3 (OUT), TLS change cipher, Change cipher spec (1):
} [1 bytes data]
* TLSv1.3 (OUT), TLS handshake, Finished (20):
} [52 bytes data]
* SSL connection using TLSv1.3 / TLS_AES_256_GCM_SHA384
* ALPN: server accepted http/1.1
* Server certificate:
*  subject: CN=localhost
*  start date: Mar 13 02:05:24 2024 GMT
*  expire date: Apr  6 02:05:24 2389 GMT
*  issuer: CN=localhost
*  SSL certificate verify result: self-signed certificate (18), continuing anyway.
* using HTTP/1.1
} [5 bytes data]
> POST /register HTTP/1.1
> Host: localhost:1443
> User-Agent: curl/8.2.1
> Accept: */*
> Content-Length: 14
> Content-Type: application/x-www-form-urlencoded
>
} [14 bytes data]
* TLSv1.3 (IN), TLS handshake, Newsession Ticket (4):
{ [57 bytes data]
* TLSv1.3 (IN), TLS handshake, Newsession Ticket (4):
{ [57 bytes data]
* old SSL session ID is stale, removing
{ [5 bytes data]
< HTTP/1.1 200 OK
< Server: nginx
< Date: Mon, 25 Mar 2024 23:40:04 GMT
< Content-Type: text/html
< Transfer-Encoding: chunked
< Connection: keep-alive
< Set-Cookie: auth=
< Set-Cookie: auth=
<
{ [1177 bytes data]
* Connection #0 to host localhost left intact
        <code>msg = no such student</code><br>
+ curl --url https://localhost:1443/register --verbose --insecure --fail --no-progress-meter --data student_id=1234
+ tee test/register_success
+ grep 'msg = welcome to the classroom'
* processing: https://localhost:1443/register
*   Trying [::1]:1443...
* Connected to localhost (::1) port 1443
* ALPN: offers h2,http/1.1
} [5 bytes data]
* TLSv1.3 (OUT), TLS handshake, Client hello (1):
} [512 bytes data]
* TLSv1.3 (IN), TLS handshake, Server hello (2):
{ [122 bytes data]
* TLSv1.3 (IN), TLS handshake, Encrypted Extensions (8):
{ [25 bytes data]
* TLSv1.3 (IN), TLS handshake, Certificate (11):
{ [1308 bytes data]
* TLSv1.3 (IN), TLS handshake, CERT verify (15):
{ [520 bytes data]
* TLSv1.3 (IN), TLS handshake, Finished (20):
{ [52 bytes data]
* TLSv1.3 (OUT), TLS change cipher, Change cipher spec (1):
} [1 bytes data]
* TLSv1.3 (OUT), TLS handshake, Finished (20):
} [52 bytes data]
* SSL connection using TLSv1.3 / TLS_AES_256_GCM_SHA384
* ALPN: server accepted http/1.1
* Server certificate:
*  subject: CN=localhost
*  start date: Mar 13 02:05:24 2024 GMT
*  expire date: Apr  6 02:05:24 2389 GMT
*  issuer: CN=localhost
*  SSL certificate verify result: self-signed certificate (18), continuing anyway.
* using HTTP/1.1
} [5 bytes data]
> POST /register HTTP/1.1
> Host: localhost:1443
> User-Agent: curl/8.2.1
> Accept: */*
> Content-Length: 15
> Content-Type: application/x-www-form-urlencoded
>
} [15 bytes data]
* TLSv1.3 (IN), TLS handshake, Newsession Ticket (4):
{ [57 bytes data]
* TLSv1.3 (IN), TLS handshake, Newsession Ticket (4):
{ [57 bytes data]
* old SSL session ID is stale, removing
{ [5 bytes data]
< HTTP/1.1 200 OK
< Server: nginx
< Date: Mon, 25 Mar 2024 23:40:04 GMT
< Content-Type: text/html
< Transfer-Encoding: chunked
< Connection: keep-alive
< Set-Cookie: auth=
< Set-Cookie: auth=
<
{ [1087 bytes data]
* Connection #0 to host localhost left intact
        <code>msg = welcome to the classroom</code><br>
+ curl --url https://localhost:1443/register --verbose --insecure --fail --no-progress-meter --data student_id=1234
+ tee test/register_fail_duplicate
+ grep 'msg = no such student'
* processing: https://localhost:1443/register
*   Trying [::1]:1443...
* Connected to localhost (::1) port 1443
* ALPN: offers h2,http/1.1
} [5 bytes data]
* TLSv1.3 (OUT), TLS handshake, Client hello (1):
} [512 bytes data]
* TLSv1.3 (IN), TLS handshake, Server hello (2):
{ [122 bytes data]
* TLSv1.3 (IN), TLS handshake, Encrypted Extensions (8):
{ [25 bytes data]
* TLSv1.3 (IN), TLS handshake, Certificate (11):
{ [1308 bytes data]
* TLSv1.3 (IN), TLS handshake, CERT verify (15):
{ [520 bytes data]
* TLSv1.3 (IN), TLS handshake, Finished (20):
{ [52 bytes data]
* TLSv1.3 (OUT), TLS change cipher, Change cipher spec (1):
} [1 bytes data]
* TLSv1.3 (OUT), TLS handshake, Finished (20):
} [52 bytes data]
* SSL connection using TLSv1.3 / TLS_AES_256_GCM_SHA384
* ALPN: server accepted http/1.1
* Server certificate:
*  subject: CN=localhost
*  start date: Mar 13 02:05:24 2024 GMT
*  expire date: Apr  6 02:05:24 2389 GMT
*  issuer: CN=localhost
*  SSL certificate verify result: self-signed certificate (18), continuing anyway.
* using HTTP/1.1
} [5 bytes data]
> POST /register HTTP/1.1
> Host: localhost:1443
> User-Agent: curl/8.2.1
> Accept: */*
> Content-Length: 15
> Content-Type: application/x-www-form-urlencoded
>
} [15 bytes data]
* TLSv1.3 (IN), TLS handshake, Newsession Ticket (4):
{ [57 bytes data]
* TLSv1.3 (IN), TLS handshake, Newsession Ticket (4):
{ [57 bytes data]
* old SSL session ID is stale, removing
{ [5 bytes data]
< HTTP/1.1 200 OK
< Server: nginx
< Date: Mon, 25 Mar 2024 23:40:04 GMT
< Content-Type: text/html
< Transfer-Encoding: chunked
< Connection: keep-alive
< Set-Cookie: auth=
< Set-Cookie: auth=
<
{ [1177 bytes data]
* Connection #0 to host localhost left intact
        <code>msg = no such student</code><br>
+ curl --url https://localhost:1443/login --verbose --insecure --no-progress-meter --data 'username=user&password=invalid'
+ tee test/login_fail_invalid
+ grep 'msg = authentication failure'
* processing: https://localhost:1443/login
*   Trying [::1]:1443...
* Connected to localhost (::1) port 1443
* ALPN: offers h2,http/1.1
} [5 bytes data]
* TLSv1.3 (OUT), TLS handshake, Client hello (1):
} [512 bytes data]
* TLSv1.3 (IN), TLS handshake, Server hello (2):
{ [122 bytes data]
* TLSv1.3 (IN), TLS handshake, Encrypted Extensions (8):
{ [25 bytes data]
* TLSv1.3 (IN), TLS handshake, Certificate (11):
{ [1308 bytes data]
* TLSv1.3 (IN), TLS handshake, CERT verify (15):
{ [520 bytes data]
* TLSv1.3 (IN), TLS handshake, Finished (20):
{ [52 bytes data]
* TLSv1.3 (OUT), TLS change cipher, Change cipher spec (1):
} [1 bytes data]
* TLSv1.3 (OUT), TLS handshake, Finished (20):
} [52 bytes data]
* SSL connection using TLSv1.3 / TLS_AES_256_GCM_SHA384
* ALPN: server accepted http/1.1
* Server certificate:
*  subject: CN=localhost
*  start date: Mar 13 02:05:24 2024 GMT
*  expire date: Apr  6 02:05:24 2389 GMT
*  issuer: CN=localhost
*  SSL certificate verify result: self-signed certificate (18), continuing anyway.
* using HTTP/1.1
} [5 bytes data]
> POST /login HTTP/1.1
> Host: localhost:1443
> User-Agent: curl/8.2.1
> Accept: */*
> Content-Length: 30
> Content-Type: application/x-www-form-urlencoded
>
} [30 bytes data]
* TLSv1.3 (IN), TLS handshake, Newsession Ticket (4):
{ [57 bytes data]
* TLSv1.3 (IN), TLS handshake, Newsession Ticket (4):
{ [57 bytes data]
* old SSL session ID is stale, removing
{ [5 bytes data]
< HTTP/1.1 200 OK
< Server: nginx
< Date: Mon, 25 Mar 2024 23:40:04 GMT
< Content-Type: text/html
< Transfer-Encoding: chunked
< Connection: keep-alive
< Set-Cookie: auth=
< Set-Cookie: auth=
< Set-Cookie: auth=
< Set-Cookie: auth=
<
{ [1382 bytes data]
* Connection #0 to host localhost left intact
        <code>msg = authentication failure</code><br>
+ curl --url https://localhost:1443/login --verbose --insecure --fail --no-progress-meter --data 'username=user&password=pass'
+ tee test/login_success
+ grep 'msg = user authenticated by password'
* processing: https://localhost:1443/login
*   Trying [::1]:1443...
* Connected to localhost (::1) port 1443
* ALPN: offers h2,http/1.1
} [5 bytes data]
* TLSv1.3 (OUT), TLS handshake, Client hello (1):
} [512 bytes data]
* TLSv1.3 (IN), TLS handshake, Server hello (2):
{ [122 bytes data]
* TLSv1.3 (IN), TLS handshake, Encrypted Extensions (8):
{ [25 bytes data]
* TLSv1.3 (IN), TLS handshake, Certificate (11):
{ [1308 bytes data]
* TLSv1.3 (IN), TLS handshake, CERT verify (15):
{ [520 bytes data]
* TLSv1.3 (IN), TLS handshake, Finished (20):
{ [52 bytes data]
* TLSv1.3 (OUT), TLS change cipher, Change cipher spec (1):
} [1 bytes data]
* TLSv1.3 (OUT), TLS handshake, Finished (20):
} [52 bytes data]
* SSL connection using TLSv1.3 / TLS_AES_256_GCM_SHA384
* ALPN: server accepted http/1.1
* Server certificate:
*  subject: CN=localhost
*  start date: Mar 13 02:05:24 2024 GMT
*  expire date: Apr  6 02:05:24 2389 GMT
*  issuer: CN=localhost
*  SSL certificate verify result: self-signed certificate (18), continuing anyway.
* using HTTP/1.1
} [5 bytes data]
> POST /login HTTP/1.1
> Host: localhost:1443
> User-Agent: curl/8.2.1
> Accept: */*
> Content-Length: 27
> Content-Type: application/x-www-form-urlencoded
>
} [27 bytes data]
* TLSv1.3 (IN), TLS handshake, Newsession Ticket (4):
{ [57 bytes data]
* TLSv1.3 (IN), TLS handshake, Newsession Ticket (4):
{ [57 bytes data]
* old SSL session ID is stale, removing
{ [5 bytes data]
< HTTP/1.1 200 OK
< Server: nginx
< Date: Mon, 25 Mar 2024 23:40:04 GMT
< Content-Type: text/html
< Transfer-Encoding: chunked
< Connection: keep-alive
< Set-Cookie: auth=
< Set-Cookie: auth=81065b12194771c9d38a95585e2f05328249e1112b66f32b97114064b2a34ef1; Expires=Tue, 26 Mar 2024 02:40:04 GMT; Max-Age=10800; Path=/
<
{ [1650 bytes data]
* Connection #0 to host localhost left intact
        <code>msg = user authenticated by password</code><br>
+ curl --url pop3s://localhost:1995 --verbose --insecure --fail --no-progress-meter --user user:pass
+ tee test/pop_get_empty
+ diff /dev/fd/62 /dev/stdin
++ printf '\r\n'
* processing: pop3s://localhost:1995
*   Trying [::1]:1995...
* Connected to localhost (::1) port 1995
} [5 bytes data]
* TLSv1.3 (OUT), TLS handshake, Client hello (1):
} [512 bytes data]
* TLSv1.3 (IN), TLS handshake, Server hello (2):
{ [122 bytes data]
* TLSv1.3 (IN), TLS handshake, Encrypted Extensions (8):
{ [6 bytes data]
* TLSv1.3 (IN), TLS handshake, Certificate (11):
{ [1308 bytes data]
* TLSv1.3 (IN), TLS handshake, CERT verify (15):
{ [520 bytes data]
* TLSv1.3 (IN), TLS handshake, Finished (20):
{ [52 bytes data]
* TLSv1.3 (OUT), TLS change cipher, Change cipher spec (1):
} [1 bytes data]
* TLSv1.3 (OUT), TLS handshake, Finished (20):
} [52 bytes data]
* SSL connection using TLSv1.3 / TLS_AES_256_GCM_SHA384
* Server certificate:
*  subject: CN=localhost
*  start date: Mar 13 02:05:24 2024 GMT
*  expire date: Apr  6 02:05:24 2389 GMT
*  issuer: CN=localhost
*  SSL certificate verify result: self-signed certificate (18), continuing anyway.
{ [5 bytes data]
* TLSv1.3 (IN), TLS handshake, Newsession Ticket (4):
{ [57 bytes data]
* TLSv1.3 (IN), TLS handshake, Newsession Ticket (4):
{ [57 bytes data]
* old SSL session ID is stale, removing
{ [5 bytes data]
< +OK POP3 ready
} [5 bytes data]
> CAPA
{ [5 bytes data]
< +OK Capability list follows
< TOP
< USER
< UIDL
< SASL PLAIN LOGIN
< .
} [5 bytes data]
> AUTH PLAIN
{ [5 bytes data]
< +
} [5 bytes data]
> AHVzZXIAcGFzcw==
{ [5 bytes data]
< +OK got username
} [5 bytes data]
> LIST
{ [5 bytes data]
< +OK maildrop follows
{ [5 bytes data]
* Connection #0 to host localhost left intact
++ printf '\r'
+ CR=$'\r'
+ curl --url smtps://localhost:1465 --verbose --insecure --fail --no-progress-meter --mail-from user@localhost --mail-rcpt other@localhost --upload-file - --user user:pass
* processing: smtps://localhost:1465
*   Trying [::1]:1465...
* Connected to localhost (::1) port 1465
} [5 bytes data]
* TLSv1.3 (OUT), TLS handshake, Client hello (1):
} [512 bytes data]
* TLSv1.3 (IN), TLS handshake, Server hello (2):
{ [122 bytes data]
* TLSv1.3 (IN), TLS handshake, Encrypted Extensions (8):
{ [6 bytes data]
* TLSv1.3 (IN), TLS handshake, Certificate (11):
{ [1308 bytes data]
* TLSv1.3 (IN), TLS handshake, CERT verify (15):
{ [520 bytes data]
* TLSv1.3 (IN), TLS handshake, Finished (20):
{ [52 bytes data]
* TLSv1.3 (OUT), TLS change cipher, Change cipher spec (1):
} [1 bytes data]
* TLSv1.3 (OUT), TLS handshake, Finished (20):
} [52 bytes data]
* SSL connection using TLSv1.3 / TLS_AES_256_GCM_SHA384
* Server certificate:
*  subject: CN=localhost
*  start date: Mar 13 02:05:24 2024 GMT
*  expire date: Apr  6 02:05:24 2389 GMT
*  issuer: CN=localhost
*  SSL certificate verify result: self-signed certificate (18), continuing anyway.
{ [5 bytes data]
* TLSv1.3 (IN), TLS handshake, Newsession Ticket (4):
{ [57 bytes data]
* TLSv1.3 (IN), TLS handshake, Newsession Ticket (4):
{ [57 bytes data]
* old SSL session ID is stale, removing
{ [5 bytes data]
< 220 localhost ESMTP ready
} [5 bytes data]
> EHLO fedora
{ [5 bytes data]
< 250-localhost
< 250 AUTH PLAIN LOGIN
} [5 bytes data]
> AUTH PLAIN
{ [5 bytes data]
< 334
} [5 bytes data]
> AHVzZXIAcGFzcw==
{ [5 bytes data]
< 235 2.0.0 OK
} [5 bytes data]
> MAIL FROM:<user@localhost>
{ [5 bytes data]
< 250 OK
} [5 bytes data]
> RCPT TO:<other@localhost>
{ [5 bytes data]
< 250 OK
} [5 bytes data]
> DATA
{ [5 bytes data]
< 354 Start input
} [5 bytes data]
< 250 OK
* Connection #0 to host localhost left intact
+ curl --url pop3s://localhost:1995/1 --verbose --insecure --fail --no-progress-meter --user user:pass
* processing: pop3s://localhost:1995/1
*   Trying [::1]:1995...
* Connected to localhost (::1) port 1995
* TLSv1.3 (OUT), TLS handshake, Client hello (1):
* TLSv1.3 (IN), TLS handshake, Server hello (2):
* TLSv1.3 (IN), TLS handshake, Encrypted Extensions (8):
* TLSv1.3 (IN), TLS handshake, Certificate (11):
* TLSv1.3 (IN), TLS handshake, CERT verify (15):
* TLSv1.3 (IN), TLS handshake, Finished (20):
* TLSv1.3 (OUT), TLS change cipher, Change cipher spec (1):
* TLSv1.3 (OUT), TLS handshake, Finished (20):
* SSL connection using TLSv1.3 / TLS_AES_256_GCM_SHA384
* Server certificate:
*  subject: CN=localhost
*  start date: Mar 13 02:05:24 2024 GMT
*  expire date: Apr  6 02:05:24 2389 GMT
*  issuer: CN=localhost
*  SSL certificate verify result: self-signed certificate (18), continuing anyway.
* TLSv1.3 (IN), TLS handshake, Newsession Ticket (4):
* TLSv1.3 (IN), TLS handshake, Newsession Ticket (4):
* old SSL session ID is stale, removing
< +OK POP3 ready
> CAPA
< +OK Capability list follows
< TOP
< USER
< UIDL
< SASL PLAIN LOGIN
< .
> AUTH PLAIN
< +
> AHVzZXIAcGFzcw==
< +OK got username
> RETR 1
< +OK message follows
Received: by localhost ; Mon, 25 Mar 2024 23:40:05 +0000 (UTC)
Message-ID: <2.1711410005.0@localhost>
From: <user@localhost>
To: <other@localhost>
Subject: Message Subject

To whom it may concern,

Bottom text
* Connection #0 to host localhost left intact
+ test_pop_get_message=0
+ orbit/warpdrive.sh -u user -w
+ python -m venv orbit-dev
+ source orbit-dev/bin/activate
++ deactivate nondestructive
++ '[' -n '' ']'
++ '[' -n '' ']'
++ hash -r
++ '[' -n '' ']'
++ unset VIRTUAL_ENV
++ unset VIRTUAL_ENV_PROMPT
++ '[' '!' nondestructive = nondestructive ']'
++ '[' linux-gnu = cygwin ']'
++ '[' linux-gnu = msys ']'
++ export VIRTUAL_ENV=/home/joel/src/singularity/orbit-dev
++ VIRTUAL_ENV=/home/joel/src/singularity/orbit-dev
++ _OLD_VIRTUAL_PATH=/home/joel/.local/bin:/home/joel/bin:/usr/local/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/home/joel/src/bash-scripts/prod:/home/joel/.fzf/bin
++ PATH=/home/joel/src/singularity/orbit-dev/bin:/home/joel/.local/bin:/home/joel/bin:/usr/local/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/home/joel/src/bash-scripts/prod:/home/joel/.fzf/bin
++ export PATH
++ '[' -n '' ']'
++ '[' -z '' ']'
++ _OLD_VIRTUAL_PS1=
++ PS1='(orbit-dev) '
++ export PS1
++ VIRTUAL_ENV_PROMPT='(orbit-dev) '
++ export VIRTUAL_ENV_PROMPT
++ hash -r
+ pip install -r orbit/dev-requirements.txt
Requirement already satisfied: flake8~=7.0.0 in ./orbit-dev/lib64/python3.12/site-packages (from -r orbit/dev-requirements.txt (line 1)) (7.0.0)
Requirement already satisfied: mccabe~=0.7.0 in ./orbit-dev/lib64/python3.12/site-packages (from -r orbit/dev-requirements.txt (line 2)) (0.7.0)
Requirement already satisfied: pycodestyle~=2.11.1 in ./orbit-dev/lib64/python3.12/site-packages (from -r orbit/dev-requirements.txt (line 3)) (2.11.1)
Requirement already satisfied: pyflakes~=3.2.0 in ./orbit-dev/lib64/python3.12/site-packages (from -r orbit/dev-requirements.txt (line 4)) (3.2.0)

[notice] A new release of pip is available: 23.2.1 -> 24.0
[notice] To update, run: pip install --upgrade pip
+ pushd orbit
~/src/singularity/orbit ~/src/singularity
+ ./test-style.sh
[SCAN] radius.py
[SCAN] config.py
[SCAN] db.py
[SCAN] hyperspace.py
+ popd
~/src/singularity

theyoyojo approved these changes Mar 25, 2024

View reviewed changes

charliemirabile added 8 commits March 25, 2024 19:27

orbit: init db: users: provide default for LFX field

d444e4b

Since we are moving away from this system of sharing resources a good place to start is to provide a default of false for lfx so that more places can avoid refering to it.

orbit: db/hyperspace: use default lfx value

9dc1650

To make the query simpler, since lfx was always being set to 0 (False) and the default is false, it does not need to be specified.

orbit: db: Remove query to check LFX status of a student

0d49d40

since 326c3d6 ("orbit: remove cruft related to lfx from mail_auth") we have not needed this database query.

orbit: hyperspace: remove ability to edit student lfx status

59a626a

since we are no longer querying the LFX status of students as part of the mail auth flow, the ability to change LFX status with the -x and -y options in hyperspace are uneeded.

orbit: hyperspace: remove do_set_{no,}lfx helpers

92b3ccf

since the -x and -y options are no longer calling these functions, they are unused.

orbit: db: remove usr_set_{no,}lfx helper

b8704f9

Since there are no callers for these functions, they (and their associated queries) are no longer needed

orbit: db/hyperspace: do not print lfx status

e5d96ac

since lfx is always false and can no longer be printed, it does not need to be displayed when viewing the student roster.

orbit: init db: users: remove lfx field

99a6834

Since there are no references to the lfx field, it does not need to be stored.

theyoyojo force-pushed the lfx_cleanup branch from 7495fd7 to 99a6834 Compare March 25, 2024 23:32

theyoyojo merged commit 3b06666 into master Mar 25, 2024

theyoyojo deleted the lfx_cleanup branch March 25, 2024 23:40

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Lfx cleanup#44

Lfx cleanup#44
theyoyojo merged 8 commits into
masterfrom
lfx_cleanup

charliemirabile commented Mar 24, 2024

Uh oh!

theyoyojo left a comment

Uh oh!

theyoyojo commented Mar 25, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

charliemirabile commented Mar 24, 2024

Uh oh!

theyoyojo left a comment

Choose a reason for hiding this comment

Uh oh!

theyoyojo commented Mar 25, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants