Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion services/brig/Procfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
web: LOG_LEVEL=Warn ./dist/brig --host=$BRIG_WEB_HOST --port=$PORT --cassandra-host=$BRIG_CASSANDRA_HOST --cassandra-port=$BRIG_CASSANDRA_PORT --cassandra-keyspace=$BRIG_CASSANDRA_KEYSPACE --galley-host=$GALLEY_WEB_HOST --galley-port=$GALLEY_WEB_PORT --gundeck-host=$GUNDECK_WEB_HOST --gundeck-port=$GUNDECK_WEB_PORT --aws-ses-queue=$AWS_USER_SES_QUEUE --aws-internal-queue=$AWS_USER_INTERNAL_QUEUE --aws-dynamo-blacklist=$AWS_USER_BLACKLIST_TABLE --aws-dynamo-prekeys=$AWS_USER_PREKEYS_TABLE --aws-account-id=$AWS_ACCOUNT --aws-access-key-id=$AWS_ACCESS_KEY_ID --aws-secret-access-key=$AWS_SECRET_ACCESS_KEY --twilio-sid=$TWILIO_SID --twilio-token=$TWILIO_TOKEN --twilio-sender=$TWILIO_SENDER --nexmo-key=$NEXMO_KEY --nexmo-secret=$NEXMO_SECRET --nexmo-endpoint=$NEXMO_ENDPOINT --activation-url=http://$BRIG_WEB_HOST:$PORT/activate?key=\${key}\&code=\${code} --sms-activation-url=http://$BRIG_WEB_HOST:$PORT/v/\${code} --password-reset-url=http://$BRIG_WEB_HOST:$PORT/password-reset/\${key}?code=\${code} --invitation-url=http://$BRIG_WEB_HOST:$PORT/register?invitation_code=\${code} --deletion-url=http://$BRIG_WEB_HOST:$PORT/users/delete?key=\${key}\&code=\${code} --provider-activation-url=http://$BRIG_WEB_HOST:$PORT/provider/activate?key=\${key}\&code=\${code} --provider-approval-url=http://$BRIG_WEB_HOST:$PORT/provider/approve?key=\${key}\&code=\${code} --team-invitation-url=http://$BRIG_WEB_HOST:$PORT/register?team=\${team}\&team_code=\${code} --template-dir=deb/opt/brig/templates --email-sender=$EMAIL_SENDER --activation-timeout=$USER_ACTIVATION_TIMEOUT --user-connection-limit=$USER_CONNECTION_LIMIT --cookie-domain=$COOKIE_DOMAIN --provider-approval-to=$PROVIDER_APPROVAL_TO --provider-home-url=$PROVIDER_HOME_URL --zauth-provider-token-timeout=$ZAUTH_PROVIDER_TOKEN_TIMEOUT --zauth-private-keys=$ZAUTH_PRIVKEYS --zauth-public-keys=$ZAUTH_PUBKEYS --zauth-key-index=$ZAUTH_KEY_INDEX --zauth-user-token-timeout=$ZAUTH_USER_TOKEN_TIMEOUT --user-cookie-renew-age=$USER_COOKIE_RENEW_AGE --zauth-access-token-timeout=$ZAUTH_ACCESS_TOKEN_TIMEOUT --zauth-session-token-timeout=$ZAUTH_SESSION_TOKEN_TIMEOUT --cookie-insecure --user-cookie-retry-after=$USER_COOKIE_RETRY_AFTER --user-cookie-min-deviation=$USER_COOKIE_MIN_DEVIATION --user-cookie-limit=$USER_COOKIE_LIMIT --turn-servers=$TURN_SERVERS --turn-secret=$TURN_SECRET --elasticsearch-url=$BRIG_ELASTICSEARCH_URL --elasticsearch-user-index=$BRIG_ELASTICSEARCH_USER_INDEX
web: LOG_LEVEL=Warn ./dist/brig --host=$BRIG_WEB_HOST --port=$PORT --cassandra-host=$BRIG_CASSANDRA_HOST --cassandra-port=$BRIG_CASSANDRA_PORT --cassandra-keyspace=$BRIG_CASSANDRA_KEYSPACE --galley-host=$GALLEY_WEB_HOST --galley-port=$GALLEY_WEB_PORT --gundeck-host=$GUNDECK_WEB_HOST --gundeck-port=$GUNDECK_WEB_PORT --aws-ses-queue=$AWS_USER_SES_QUEUE --aws-internal-queue=$AWS_USER_INTERNAL_QUEUE --aws-dynamo-blacklist=$AWS_USER_BLACKLIST_TABLE --aws-dynamo-prekeys=$AWS_USER_PREKEYS_TABLE --aws-account-id=$AWS_ACCOUNT --aws-access-key-id=$AWS_ACCESS_KEY_ID --aws-secret-access-key=$AWS_SECRET_ACCESS_KEY --twilio-sid=$TWILIO_SID --twilio-token=$TWILIO_TOKEN --twilio-sender=$TWILIO_SENDER --nexmo-key=$NEXMO_KEY --nexmo-secret=$NEXMO_SECRET --nexmo-endpoint=$NEXMO_ENDPOINT --activation-url=http://$BRIG_WEB_HOST:$PORT/activate?key=\${key}\&code=\${code} --team-activation-url=http://$BRIG_WEB_HOST:$PORT/activate?key=\${key}\&code=\${code} --sms-activation-url=http://$BRIG_WEB_HOST:$PORT/v/\${code} --password-reset-url=http://$BRIG_WEB_HOST:$PORT/password-reset/\${key}?code=\${code} --invitation-url=http://$BRIG_WEB_HOST:$PORT/register?invitation_code=\${code} --deletion-url=http://$BRIG_WEB_HOST:$PORT/users/delete?key=\${key}\&code=\${code} --provider-activation-url=http://$BRIG_WEB_HOST:$PORT/provider/activate?key=\${key}\&code=\${code} --provider-approval-url=http://$BRIG_WEB_HOST:$PORT/provider/approve?key=\${key}\&code=\${code} --team-invitation-url=http://$BRIG_WEB_HOST:$PORT/register?team=\${team}\&team_code=\${code} --template-dir=deb/opt/brig/templates --email-sender=$EMAIL_SENDER --activation-timeout=$USER_ACTIVATION_TIMEOUT --user-connection-limit=$USER_CONNECTION_LIMIT --cookie-domain=$COOKIE_DOMAIN --provider-approval-to=$PROVIDER_APPROVAL_TO --provider-home-url=$PROVIDER_HOME_URL --zauth-provider-token-timeout=$ZAUTH_PROVIDER_TOKEN_TIMEOUT --zauth-private-keys=$ZAUTH_PRIVKEYS --zauth-public-keys=$ZAUTH_PUBKEYS --zauth-key-index=$ZAUTH_KEY_INDEX --zauth-user-token-timeout=$ZAUTH_USER_TOKEN_TIMEOUT --user-cookie-renew-age=$USER_COOKIE_RENEW_AGE --zauth-access-token-timeout=$ZAUTH_ACCESS_TOKEN_TIMEOUT --zauth-session-token-timeout=$ZAUTH_SESSION_TOKEN_TIMEOUT --cookie-insecure --user-cookie-retry-after=$USER_COOKIE_RETRY_AFTER --user-cookie-min-deviation=$USER_COOKIE_MIN_DEVIATION --user-cookie-limit=$USER_COOKIE_LIMIT --turn-servers=$TURN_SERVERS --turn-secret=$TURN_SECRET --elasticsearch-url=$BRIG_ELASTICSEARCH_URL --elasticsearch-user-index=$BRIG_ELASTICSEARCH_USER_INDEX
1 change: 1 addition & 0 deletions services/brig/deb/etc/sv/brig/run
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ exec chpst -u $USER \
--cassandra-port=${BRIG_CASSANDRA_PORT?'unset'} \
--cassandra-keyspace=${BRIG_CASSANDRA_KEYSPACE?'unset'} \
--activation-url=${BRIG_ACTIVATION_URL?'unset'} \
--team-activation-url=${BRIG_TEAM_ACTIVATION_URL?'unset'} \
--activation-timeout=${BRIG_ACTIVATION_TIMEOUT?'unset'} \
--sms-activation-url=${BRIG_SMS_ACTIVATION_URL?'unset'} \
--password-reset-url=${BRIG_PASSWORD_RESET_URL?'unset'} \
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Dein Wire-Benutzerkonto
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
</head>
<body style="
font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, 'Helvetica Neue', Helvetica, Arial, sans-serif;
margin: 0;
padding: 0;
font-size: 16px;
font-weight: 400;
line-height: 1.5em;
color: #42474A;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
">
<br>
<table width="100%" cellpadding="0" cellspacing="0">
<tr>
<td>
<center>
<table cellpadding="0" cellspacing="10" style="
max-width: 500px;
margin: 12px auto 0 auto;
font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, 'Helvetica Neue', Helvetica, Arial, sans-serif;
">
<thead>
<tr>
<td style="padding-bottom: 0px;">
<a href="https://wire.com"><img src="https://wire.com/p/img/email/logo-email-black.png"
width="57" height="18"
alt="Wire"></a>
</td>
<td style="text-align: right; text-transform: uppercase; font-size: 12px; font-weight: 500;">
<a href="https://wire.com" style="text-decoration: none; color: #42474A;">wire.com</a>
</td>
</tr>
</thead>
<tbody style="font-size: 16px;">
<tr>
<td width="500" colspan="2" style="padding-top: 48px;padding-bottom: 0px;">
<p style="font-size: 32px; font-weight: 300; text-align: center; line-height: 1.3;">
Dein neues Wire-Benutzerkonto im '${team}' Team
</p>
<br/>
<p>Ein Wire Benutzerkonto in einem neuen Wire Team namens <strong>'${team}'</strong> wurde mit der E-Mail-Adresse <strong>${email}</strong> erstellt. Wir möchten gerne sicherstellen, dass du <strong>${name}</strong> bist.
<p style="text-align: center;">
<!--[if mso]>
<v:roundrect href="${url}" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word"
style="height:32px;
v-text-anchor:middle;
width: 110px;"
arcsize="10%"
stroke="f"
fillcolor="#3898DD"
>
<w:anchorlock/>
<center>
<![endif]-->
<a href="${url}" style="
text-decoration: none;
background-color: #018ED6;
border-radius: 8px;
padding-left: 24px;
padding-right: 24px;
padding-top: 8px;
padding-bottom: 8px;
color: white;
font-weight: 600;
font-size: 16px;
display: inline-block;
margin: 20px 0;
line-height: 2;
">VERIFIZIEREN</a>
<!--[if mso]>
</center>
</v:roundrect>
<![endif]-->
</p>
<p style="font-size: 10pt; font-weight: 300; line-height: 1.5em; color: #000;">
Bitte klicke open auf "Verifizieren", um deine Identität zu bestätigen. Erst danach kannst du Wire nutzen.
</p>
<p style="font-size: 10pt; font-weight: 300; line-height: 1.5em; color: #000;">
Wenn du nicht auf den "Verifizieren"-Button klicken kannst, benutze stattdessen bitte folgenden Link: <br>
</p>
<p style="font-size: 10pt; font-weight: 300; line-height: 1.5em; color: #BAC8D1; overflow-wrap: break-word; word-wrap: break-word; -ms-word-break: break-all; word-break: break-word;">
${url}
</p>
<p style="font-size: 10pt; font-weight: 300; line-height: 1.5em; color: #000;">
Wenn du kein Wire-Benutzerkonto mit dieser E-Mail-Adresse erstellt hast, klicke bitte <a href="https://support.wire.com/hc/de/requests/new" style="color: #3898DD; font-weight: 400; text-decoration:none!important;">hier</a>.
</p>
</p>
</td>
</tr>
</tbody>
<tfoot style="text-align: center;">
<tr>
<td width="500" colspan="2"
style="font-size: 12px; font-weight: 500; line-height: 2em; color: #42474A; text-transform: uppercase; padding-top: 40px; padding-bottom: 40px; border-top: 1px solid #E9EDF0;">
<a href="https://wire.com/legal/" style="
color: #B9BCBD;
font-weight: 500;
text-decoration:none !important;
">Datenschutzrichtlinie</a><span style="margin-left: 8px; margin-right: 8px; color: #B9BCBD;">&middot;</span>
<a href="mailto:misuse@wire.com" style="color: #B9BCBD;font-weight: 500;text-decoration:none
!important;">Missbrauch melden</a><br>Wire Swiss GmbH. Alle Rechte vorbehalten.
</td>
</tr>
</tfoot>
</table>
</center>
</td>
</tr>
</table>
</body>
</html>

Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
Wire


Hallo,


Ein Wire Benutzerkonto in einem neuen Wire Team namens '${team}' wurde mit der E-Mail-Adresse ${email} erstellt. Wir möchten gerne sicherstellen, dass du ${name} bist.

Bitte klicke auf den folgenden Link, um deine Identität zu bestätigen. Erst danach kannst du Wire nutzen.


${url}

Bitte antworte nicht auf diese E-Mail.

Wenn du kein Wire-Benutzerkonto mit dieser E-Mail-Adresse erstellt hast, gehe bitte auf https://support.wire.com




(c) Wire Swiss GmbH

Datenschutzrichtlinie | Missbrauch melden

Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
display: inline-block;
margin: 20px 0;
line-height: 3;
text-align: center;
">VERIFY</a>
<!--[if mso]>
</center>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Your Wire Account
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
</head>
<body style="
font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, 'Helvetica Neue', Helvetica, Arial, sans-serif;
margin: 0;
padding: 0;
font-size: 16px;
font-weight: 400;
line-height: 1.5em;
color: #42474A;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
">
<br>
<table width="100%" cellpadding="0" cellspacing="0">
<tr>
<td>
<center>
<table cellpadding="0" cellspacing="10" style="
max-width: 500px;
margin: 12px auto 0 auto;
font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, 'Helvetica Neue', Helvetica, Arial, sans-serif;
">
<thead>
<tr>
<td style="padding-bottom: 0px;">
<a href="https://wire.com"><img src="https://wire.com/p/img/email/logo-email-black.png"
width="57" height="18"
alt="Wire"></a>
</td>
<td style="text-align: right; text-transform: uppercase; font-size: 12px; font-weight: 500;">
<a href="https://wire.com" style="text-decoration: none; color: #42474A;">wire.com</a>
</td>
</tr>
</thead>
<tbody style="font-size: 16px;">
<tr>
<td width="500" colspan="2" style="padding-top: 48px;padding-bottom: 0px;">
<p style="font-size: 32px; font-weight: 300; text-align: center; line-height: 1.3;">
Your new account on the ${team} team
</p>
<br/>
<p>
A new Wire team called <strong>${team}</strong> was created with <strong>${email}</strong>. We want to verify that you are indeed <strong>${name}</strong>
</p>
<p style="text-align: center;">
<!--[if mso]>
<v:roundrect href="${url}" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word"
style="height:32px;
v-text-anchor:middle;
width: 110px;"
arcsize="10%"
stroke="f"
fillcolor="#3898DD"
>
<w:anchorlock/>
<center>
<![endif]-->
<a href="${url}" style="
text-decoration: none;
background-color: #018ED6;
border-radius: 8px;
padding-left: 24px;
padding-right: 24px;
padding-top: 8px;
padding-bottom: 8px;
color: white;
font-weight: 600;
font-size: 16px;
display: inline-block;
margin: 20px 0;
line-height: 2;
">VERIFY</a>
<!--[if mso]>
</center>
</v:roundrect>
<![endif]-->
</p>
<p style="font-size: 10pt; font-weight: 300; line-height: 1.5em; color: #000;">
Click the button above to verify your address. You won&#8217;t be able to use Wire until you do.
</p>
<p style="font-size: 10pt; font-weight: 300; line-height: 1.5em; color: #000;">
If you can&#8217;t click on the button, use this link: <br>
</p>
<p style="font-size: 10pt; font-weight: 300; line-height: 1.5em; color: #BAC8D1; overflow-wrap: break-word; word-wrap: break-word; -ms-word-break: break-all; word-break: break-word;">
${url}
</p>
<p style="font-size: 10pt; font-weight: 300; line-height: 1.5em; color: #000;">
If you didn&#8217;t create a Wire account using this email address, please
<a href="http://support.wire.com/hc/en-us/requests/new" style="color: #3898DD; font-weight: 400; text-decoration:none!important;">
contact us
</a>.
</p>
</td>
</tr>
</tbody>
<tfoot style="text-align: center;">
<tr>
<td width="500" colspan="2"
style="font-size: 12px; font-weight: 500; line-height: 2em; color: #42474A; text-transform: uppercase; padding-top: 40px; padding-bottom: 40px; border-top: 1px solid #E9EDF0;">
<a href="https://wire.com/legal/" style="
color: #B9BCBD;
font-weight: 500;
text-decoration:none !important;
">Privacy</a><span style="margin-left: 8px; margin-right: 8px; color: #B9BCBD;">&middot;</span>
<a href="mailto:misuse@wire.com" style="color: #B9BCBD;font-weight: 500;text-decoration:none
!important;">Report Misuse</a><br>Wire Swiss GmbH. All Rights Reserved.
</td>
</tr>
</tfoot>
</table>
</center>
</td>
</tr>
</table>
</body>
</html>
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
Wire


Hello,

A new Wire team called ${team} was created with ${email}. We want to verify that you are indeed ${name}.

Follow the link below to verify your address. You won't be able to use Wire until you do.


${url}

Please don't reply to this message.

If you didn't create a Wire account using this email address, please visit https://support.wire.com




(c) Wire Swiss GmbH

Privacy Policy | Report misuse
Loading