7ec7e06c2b
Move alias transfer util outside the views to make it importable ( #1855 )
2023-08-31 13:42:44 +02:00
ef90423a35
Fix: Use proper error when linking external partner accounts
2023-08-30 13:49:47 +02:00
c04f5102d6
Fix: Handle email headers as strings if the are Header type ( #1850 )
2023-08-29 12:37:26 +02:00
5714403976
Can use generic subject without pgp ( #1847 )
...
* improve wording for hide my subject option
* can use generic subject on a non-pgp mailbox
---------
Co-authored-by: Son NK <son@simplelogin.io>
2023-08-24 22:47:31 +02:00
40ff4604c8
fix: handle Proton account not validated case ( #1842 )
2023-08-18 15:59:46 +02:00
0435c745fd
disable the PGP section if the mailbox is proton and not has PGP enabled ( #1841 )
...
* disable the PGP section if the mailbox is proton and not has PGP enabled
* fix format
---------
Co-authored-by: Son NK <son@simplelogin.io>
2023-08-09 09:56:53 +02:00
4bf925fe6f
Revert contact creation ( #1836 )
...
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-08-04 14:01:21 +02:00
0e82801512
chore: add upcloud monitoring ( #1835 )
...
* chore: add upcloud monitoring
* Added db_role to new_relic metrics
---------
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-08-04 12:19:00 +02:00
9ab3695d36
Fix: Do not lowercase by default contact emails ( #1834 )
...
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-08-04 10:36:13 +02:00
6e4f6fe540
Sanitize alias, contacts, mailboxes and users before creating them ( #1829 )
...
* Sanitize alias, contacts, mailboxes and users before creating them
* Updated comments and moved crons to run when load is low
* Run the stats at the same time as previously
---------
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-08-03 10:20:25 +02:00
e9e863807c
Add missing indexes ( #1824 )
...
* Rate limit the sudo route
* Add missing indexes
* Updated index
* Update index creation to run with concurrent
* With autocommit block
---------
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-07-29 10:03:31 +02:00
c4003b07ac
Rate limit the sudo route ( #1823 )
...
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-07-26 12:56:06 +02:00
d8943cf126
Fix: Allow to create more than one api key if the user has more than one ( #1822 )
...
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-07-25 17:15:18 +02:00
04d92b7f23
Fix: Use MIMEText for text contents ( #1801 )
...
* Fix: For badly formatted messages use MIMEText
* Fix: For badly formatted messages use MIMEText
* fix test
---------
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-07-11 16:48:01 +02:00
cb900ed057
Fix: For badly formatted messages use MIMEText ( #1800 )
...
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-07-11 16:23:37 +02:00
516072fd99
Fix: save retries to disk ( #1799 )
...
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-07-11 10:59:24 +02:00
e2dbf8d48d
Avoid sending long encoded subject to sentry ( #1798 )
...
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-07-10 14:41:42 +02:00
d62bff8e46
Add rate limit and maximum amount of api keys ( #1788 )
...
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-06-29 17:21:00 +02:00
ac9d550069
Fix: delete_header has no return value ( #1786 )
...
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-06-27 14:42:52 +02:00
daec781ffc
Fix unsubscribe header manipulation ( #1785 )
...
* Added debug statements to find out unsubscribe issues
* Add List-Unsubscribe headers to preserve list
* Cleanup debug messages
---------
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-06-27 11:18:44 +02:00
501c625ddf
set default alias suffix to word ( #1765 )
...
Co-authored-by: Son NK <son@Sons-MacBook-Air-2.local>
2023-06-27 11:07:02 +02:00
d3aae31d45
Preserve original from header in X-SimpleLogin-Original-From ( #1784 )
...
* Preserve original from in the headers
* Update the settings page
---------
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-06-23 12:43:06 +02:00
76b05e0d64
Preserve original sender and authentication results if the original email is preserved in the alias ( #1780 )
...
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-06-22 10:40:32 +02:00
f046b2270c
Fix: send also mailbox email to verify so that mailbox changes are not allowed ( #1777 )
...
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-06-21 18:56:22 +02:00
03c67ead44
Do not show the default domain twice ( #1772 )
...
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-06-21 18:56:03 +02:00
37ffe4d5fe
Fix: Always include default domain in the list of domains ( #1768 )
...
* Fix: Always include default domain in the list of domains
* Add premium test
---------
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-06-06 15:55:10 +02:00
689ef3a579
Check if the domain has a deleted alias ( #1764 )
...
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-06-01 17:33:58 +02:00
495d544505
Only retry n times each message ( #1759 )
...
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-06-01 10:59:02 +02:00
a539428607
Fix: If default domain is premium for free users do not offer it as an option ( #1763 )
...
* Fix: If default domain is premium for free users do not offer it as an option
* Refactored into simpler logic
---------
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-06-01 10:46:25 +02:00
9d9e5fcab6
Fix: If the default domain is hidden do not return it ( #1761 )
...
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-05-31 17:59:49 +02:00
ff33392398
Fix: use incorrect model to access profile picture path ( #1760 )
...
(cherry picked from commit e875f1dd40fe726f6e83aaa833f65eb9e10f7e94)
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-05-31 17:21:30 +02:00
85964f283e
Add timeout to any outbound connection ( #1756 )
...
* Add timeout to any outbound connection
* Change log message to error
---------
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-05-31 14:19:43 +02:00
d30183bbda
fix: remove user password from export user data ( #1758 )
2023-05-31 09:40:20 +02:00
ed66c7306b
Fix typo ( #1755 )
...
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-05-29 17:50:41 +02:00
07bb658310
Show the default domain for creating aliases even if it's not requested by a partner ( #1754 )
...
* Show the default domain in the suffixes even if it's not allowed
* Simplify logic
* Reformat
* Simplified logic
* Remove unused function
* Added test to validate suffixes
* Ensure we catch prefixes in test
---------
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-05-29 16:40:04 +02:00
e43a2dd34d
Have subscription callback whenever a subscription changes ( #1748 )
...
* Have subscription callback whenever a subscription changes
* Fixed tests
---------
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-05-26 15:33:55 +02:00
3de83f2f05
Add toggle to check if a user is premium without the partner subscription ( #1739 )
...
* Add toggle to check if a user is premium without the partner subscription
* fix test
* Parter created users do not have a newsletter alias id
---------
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-05-15 12:34:58 +02:00
e4d4317988
Various fixes ( #1733 )
...
* Reset all password tokens on password reset
* Added csrf validation on email change request and validation
* Return the same wether is a valid email or not
---------
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-05-10 15:31:30 +02:00
6dfb6bb3e4
Revert "Add code verification for creating mailboxes ( #1725 )" ( #1727 )
...
This reverts commit a5e7da10dd
2023-05-09 18:04:04 +02:00
a5e7da10dd
Add code verification for creating mailboxes ( #1725 )
...
* Add code verification for creating mailboxes
* Added validation checks
* Use exceptions
* Added delete to the mailbox utils
* Fix test
* Update package.lock
* Fix delete error
---------
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-05-09 16:35:58 +02:00
5ddbca05b2
Check users aren't using an alias as their link email address for partner links ( #1724 )
...
(cherry picked from commit 93e24cb4239b812d46f119a982edd12de2406802)
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-05-08 18:47:10 +02:00
7cb7b48845
Ensure coupons are only used once ( #1718 )
...
* Ensure coupons are only used once
* Update test to handle redirect
---------
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-05-03 16:18:46 +02:00
6276ad4419
Stats endpoint ( #1716 )
...
* update some dependencies: newrelic, gevent
that isn't compatible with python 3.11 on mac
* update package-lock using npm 9.6.4 and node 20.0
* Add GET /api/stats
* update pytest
---------
Co-authored-by: Son Nguyen Kim <son@Sons-MacBook-Air-2.local>
2023-05-03 10:15:47 +02:00
bec8cb2292
Alias domain as contact domain ( #1689 )
...
* Use the alias domain for contacts
* Check there are not duplicate emails
* Check also in trash
* Use helper
* Set VERP for the forward phase to the contact domain
* Add pgp_fingerprint as index for contacts
* Removed check trash
* Only use reply domains for sl domains
* Configure via db wether the domain can be used as a reverse_domain
* Fix: typo
* reverse logic
* fix migration
* fix test
---------
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
Co-authored-by: Son <nguyenkims@users.noreply.github.com>
2023-04-20 12:14:53 +02:00
7f23533c64
Fix sever typo ( #1701 )
...
* Fix: typo
* Limit the name to 100 chars
* Fix migration
---------
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-04-20 11:06:59 +02:00
62fecf1190
Add end_at index to PartnerSubscription ( #1696 )
...
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-04-15 20:49:59 +02:00
796c0c5aa1
Add alias indexes in the tables that refer to alias to speedup the alias deletion process ( #1693 )
...
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-04-14 19:08:52 +02:00
5a56b46650
Add pgp_fingerprint as index for contacts ( #1692 )
...
(cherry picked from commit 350d246d32
2023-04-14 18:29:06 +02:00
71fd5e2241
Reduce rate limit on password forgot route ( #1683 )
...
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-04-06 15:55:37 +02:00
97cbff5dc9
Fix: add missing alias options ( #1682 )
...
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-04-06 12:42:18 +02:00
b6f79ea3a6
Refactor alias options and add it to more methods ( #1681 )
...
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-04-06 11:07:13 +02:00
43b91cd197
Create Partner only domains ( #1665 )
...
* Add Partner only domains
* Add hidden domain to the test and revert to default domains after the tests
* Send what to show in each call
* Fix: Pass none instead of false
* Removed flag from partnerusr
---------
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-04-04 15:21:51 +02:00
03e5083d97
use {word1}_{word2}{digits} as random alias address instead of {word1}{word2}{digits} ( #1673 )
2023-04-04 08:46:29 +02:00
1f9d784382
Use a shorter suffix in case of custom domain ( #1670 )
2023-03-28 22:33:28 +02:00
b081b6a16a
track "visit pricing" and "upgraded" event ( #1662 )
2023-03-23 21:11:05 +01:00
66039c526b
use PreserveOriginal as default ( #1652 )
2023-03-22 15:47:40 +01:00
f722cae8d6
Add multiple registration warning message ( #1653 )
...
* Add multiple registration warning message
* Add alert
---------
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-03-22 15:35:33 +01:00
b6286e3c1b
Fix recreate alias from trash ( #1641 )
...
* no need to check for a deleted alias that belongs to user domain
* fix config.SAVE_UNSENT_DIR not set
2023-03-17 15:39:59 +01:00
b470ab3396
reset transfer token ( #1638 )
2023-03-17 11:47:11 +01:00
66388e72e0
Feat: Use only sfw words with a number suffix ( #1625 )
...
* Feat: Use only sfw words with a number suffix
* Updated also custom aliases to have a number suffix
* do not use _ as separator
* use _ as separator for words-based suffix
---------
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
Co-authored-by: Son <nguyenkims@users.noreply.github.com>
2023-03-13 19:55:16 +01:00
432fb3fcf7
Fix: Send different exception for users with an alias as email ( #1630 )
...
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-03-13 14:57:00 +01:00
44e0dd8635
Break using an alias as a mailbox loop in the email_handler.py ( #1624 )
...
* Do not allow to use email alias as account email when linking
* Add missing status
* Remove TODO
* Also break contact as email loop
* Better test names
* Allow a reverse alias to send an email to an alias
* Ident fix
* Removed invalid test
---------
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-03-13 13:01:00 +01:00
3fcb37f246
Reformat base64 encoded messages to shorter lines ( #1575 )
...
* Reformat base64 encoded messages to shorter lines
* Remove storing debug versions
* Add example test email
* Update linelength to 76
* Revert changes in pre-commit
---------
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-02-21 15:28:06 +01:00
62ba2844f3
add admin page for InvalidMailboxDomain ( #1573 )
...
* add admin page for InvalidMailboxDomain
* show creation and modification date for InvalidMailboxDomain
2023-02-15 10:38:18 +01:00
9143a0f6bc
fix: ensure contact name fits within db limits ( #1568 )
2023-02-10 10:07:43 +01:00
48ae859e1b
Fix: Set the smtp default port in config to allow connect to port 25 with TLS ( #1564 )
...
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-02-06 16:53:10 +01:00
170082e2c1
after deleting an alias, user should stay on the same page ( #1546 )
...
* after deleting an alias, user should stay on the same page
* Fix delete alias mlec (#1547 )
* Specify how to create the certificates if they don't exist in readme (#1533 )
* Remove id= from get 🩹
* Add flash message level 🩹
* Rename transfer_mailbox back to new_mailbox in the create-mailbox part 🩹
Co-authored-by: rubencm <rubencm@gmail.com>
* Fix delete alias mlec (#1552 )
* Specify how to create the certificates if they don't exist in readme (#1533 )
* Remove id= from get 🩹
* Add flash message level 🩹
* Rename transfer_mailbox back to new_mailbox in the create-mailbox part 🩹
* Linting files to pass test 🎨
Co-authored-by: rubencm <rubencm@gmail.com>
Co-authored-by: mlec <42201667+mlec1@users.noreply.github.com>
Co-authored-by: rubencm <rubencm@gmail.com>
2023-01-25 13:16:10 +01:00
4f2b624cc7
Set the proper link for unsub newsletter ( #1503 )
...
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-01-17 11:56:00 +01:00
81eb56e213
Tranfer aliases to a new mailbox when deleting mailboxes ( #1534 )
...
* Set up npm clean install instead of npm install in order to keep the version of npm packages 🎨
* Add option to transfer the alias to a new mailbox when a mailbox is deleted
* Moved alias transfer to job
* Lint
* Update forms
* Revert dockerfile change
Co-authored-by: ewen <ewen.coppens@a1.digital>
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-01-17 11:55:34 +01:00
d874acfe2c
Fix: Add CSRF validation to api key management page ( #1523 )
...
* Fix: Add CSRF validation to api key management page
* Added csrf to subdomain creation
* Added CSRF to totp cancel
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-01-12 12:34:47 +01:00
0ab53ad49a
Fix: Use timed signers to avoid leaving permanent links ( #1524 )
...
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-01-12 12:34:14 +01:00
92de307c75
Added parallel limiting to creating custom domains, directories, mailboxes and subdomains ( #1525 )
...
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-01-11 22:08:52 +01:00
38c93e7f85
Fix: typo in the message ( #1522 )
...
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2023-01-11 22:05:31 +01:00
f2a840016b
chore: allow redis to support rediss ( #1526 )
2023-01-11 16:25:35 +01:00
9378b8a17d
Fix: Return email in the get_communication_email always and search for the alias when needed ( #1497 )
...
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2022-12-19 09:23:53 +01:00
3f84a63e6d
Extend validity of totp tokens for up to a minute. ( #1494 )
...
* Feat: Allow TOTP for up to one minute in the future and in the past
* Feat: Allow TOTP for up to one minute in the future and in the past
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2022-12-16 17:54:46 +01:00
5e48d86efa
Canonicalize emails from google and proton before registering users ( #1493 )
...
* Revert "Revert "Use canonical email when registering users (#1458 )" (#1474 )"
This reverts commit c8ab1c747e
2022-12-14 11:50:36 +01:00
9dcf063337
Rate limit changing user settings ( #1491 )
...
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2022-12-13 18:48:44 +01:00
73c0429cad
Fix: Set oneclick link for unsubscribe of the newsletter for tx emails ( #1465 )
...
* Feat: Add unsub oneclick to the base transactional email template
* Format
* Removed unused
* Format
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2022-12-13 16:59:14 +01:00
21e9fce3ba
Set the admin view to show 100 entries by default ( #1490 )
...
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2022-12-13 16:58:27 +01:00
c8ab1c747e
Revert "Use canonical email when registering users ( #1458 )" ( #1474 )
...
* Revert "Use canonical email when registering users (#1458 )"
This reverts commit f728b0175a
2022-12-08 10:57:46 +01:00
7e360bcbd9
Fix: Add mising csrf validation for contact pgp key modification ( #1463 )
...
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2022-12-02 15:13:38 +01:00
327b672f24
Set the user name on creation to the original email ( #1462 )
...
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2022-12-01 13:07:36 +01:00
0996378537
Revert "Keep the dirty email after registering ( #1459 )" ( #1460 )
...
This reverts commit 0664e3b80c
2022-12-01 09:19:15 +01:00
0664e3b80c
Keep the dirty email after registering ( #1459 )
...
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2022-11-30 18:38:48 +01:00
f728b0175a
Use canonical email when registering users ( #1458 )
...
* Use canonical email for registration, check both when checking if user exists
* Fix test
* Set pagesize to 100
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2022-11-30 17:19:55 +01:00
53ef99562c
Add unsub link to newsletters ( #1455 )
...
* Add unsub link to newsletters
* Remove debug statement
* Updated unsub link
* Update unsub style
* Format
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2022-11-28 15:08:46 +01:00
3c36f37a12
Feat: Add enable/disable options in the admin panel ( #1450 )
...
* Feat: Add enable/disable options in the admin panel
* Fix duplicate method
* Black format
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2022-11-28 10:39:18 +01:00
b849d1cfa7
Simpler csv export ( #1383 )
...
* Export alias in csv
* reformating
* template
* Improved contributing script and doc
* Updated test
* removed csv export from GDPR export archive
* added test for new route
* fix trailing space
* moved test to new utils file
2022-11-23 13:51:08 +01:00
989358af34
Fix empty authorized address ( #1423 )
...
* not allow empty authorized address
* check authorized address before adding
* use github for flake8
* fix test
2022-11-15 16:04:31 +01:00
4661972f97
Fix: When re-sending emails if they trigger exceptions move out of failed dir ( #1411 )
...
* Fix: When re-sending emails if they trigger exceptions move out of failed dir
* Use proper timeout
* Lint
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2022-11-10 13:24:46 +01:00
25743da161
Dmarc transactional ( #1402 )
...
* make sure transactional email use the same domain for header from and envelope from
* fix import
2022-11-04 14:22:28 +01:00
5bbf6a2654
Fix: Only override postfix port when enabling TLS if the port is set to be 25 ( #1401 )
...
* Fix: Only override postfix port when enabling TLS if the port is set to be 25
* Add connection timeout
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2022-11-04 11:13:19 +01:00
dace2b1233
Fix: Do not re-re-deliver unsent mails on failure to re-deliver ( #1397 )
...
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2022-11-03 17:48:09 +01:00
90d60217a4
Feat: Re-deliver mails ( #1394 )
...
* Feat: Send undelivered emails
* Add cron job
* Added to the crontab
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2022-11-02 15:51:14 +01:00
3bc976c322
Feature: Add app name to each db connection ( #1393 )
...
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2022-11-02 15:41:48 +01:00
36d1626972
Notify another mailbox about an email sent by a mailbox to a reverse alias ( #1381 )
...
* Notify another mailbox about an email sent by a mailbox to a reverse alias
* keep reverse alias in CC and To header
* use alias as From to hint that the email is sent from the alias
* keep original subject, improve wording
* only add DKIM if custom domain has DKIM enabled
2022-10-30 19:59:42 +01:00
02f42821c5
fix 21004 error ( #1380 )
2022-10-27 14:03:11 +02:00
a5056b3fcc
Fix: Use source ip if user is not authenticated ( #1379 )
...
* Fix: Use source ip if user is not authenticated
* Fix lint
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2022-10-27 13:37:45 +02:00
f6463a5adc
Change: Do not sleep on exclusive zones ( #1375 )
...
* Change: Do not sleep on exclusive zones
* Update test
Co-authored-by: Adrià Casajús <adria.casajus@proton.ch>
2022-10-27 10:40:33 +02:00
Adrià Casajús
Adrià Casajús
Son Nguyen Kim
Carlos Quintana
Spitfireap