TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-11 21:37:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: fix some requests (#198)

Browse Source 
* fix: alway do permission check

* fix: alway do permission check

* fix: add project query to applications search request

* fix: add email template to statik

* fix: org members
This commit is contained in:
Fabi
2020-06-10 10:47:50 +02:00
committed by GitHub
parent ef9b03cc84
commit 207842be91
22 changed files with 3394 additions and 3294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/notification/repository/eventsourcing/handler/handler.go
View File

@@ -10,6 +10,7 @@ import (
"github.com/caos/zitadel/internal/i18n"
"github.com/caos/zitadel/internal/notification/repository/eventsourcing/view"
usr_event "github.com/caos/zitadel/internal/user/repository/eventsourcing"
"net/http"
"time"
)
@@ -30,7 +31,7 @@ type EventstoreRepos struct {
UserEvents *usr_event.UserEventstore
}
func Register(configs Configs, bulkLimit, errorCount uint64, view *view.View, eventstore eventstore.Eventstore, repos EventstoreRepos, systemDefaults sd.SystemDefaults, i18n *i18n.Translator) []spooler.Handler {
func Register(configs Configs, bulkLimit, errorCount uint64, view *view.View, eventstore eventstore.Eventstore, repos EventstoreRepos, systemDefaults sd.SystemDefaults, i18n *i18n.Translator, dir http.FileSystem) []spooler.Handler {
aesCrypto, err := crypto.NewAESCrypto(systemDefaults.UserVerificationKey)
if err != nil {
logging.Log("HANDL-s90ew").WithError(err).Debug("error create new aes crypto")
@@ -44,6 +45,7 @@ func Register(configs Configs, bulkLimit, errorCount uint64, view *view.View, ev
systemDefaults: systemDefaults,
AesCrypto: aesCrypto,
i18n: i18n,
statikDir: dir,
},
}
}

8
internal/notification/repository/eventsourcing/handler/notification.go
View File

@@ -10,6 +10,7 @@ import (
"github.com/caos/zitadel/internal/notification/types"
usr_event "github.com/caos/zitadel/internal/user/repository/eventsourcing"
es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model"
"net/http"
"time"
"github.com/caos/logging"
@@ -26,6 +27,7 @@ type Notification struct {
systemDefaults sd.SystemDefaults
AesCrypto crypto.EncryptionAlgorithm
i18n *i18n.Translator
statikDir http.FileSystem
}
const (
@@ -77,7 +79,7 @@ func (n *Notification) handleInitUserCode(event *models.Event) (err error) {
if err != nil {
return err
}
err = types.SendUserInitCode(n.i18n, user, initCode, n.systemDefaults, n.AesCrypto)
err = types.SendUserInitCode(n.statikDir, n.i18n, user, initCode, n.systemDefaults, n.AesCrypto)
if err != nil {
return err
}
@@ -95,7 +97,7 @@ func (n *Notification) handlePasswordCode(event *models.Event) (err error) {
if err != nil {
return err
}
err = types.SendPasswordCode(n.i18n, user, pwCode, n.systemDefaults, n.AesCrypto)
err = types.SendPasswordCode(n.statikDir, n.i18n, user, pwCode, n.systemDefaults, n.AesCrypto)
if err != nil {
return err
}
@@ -113,7 +115,7 @@ func (n *Notification) handleEmailVerificationCode(event *models.Event) (err err
if err != nil {
return err
}
err = types.SendEmailVerificationCode(n.i18n, user, emailCode, n.systemDefaults, n.AesCrypto)
err = types.SendEmailVerificationCode(n.statikDir, n.i18n, user, emailCode, n.systemDefaults, n.AesCrypto)
if err != nil {
return err
}

2
internal/notification/repository/eventsourcing/repository.go
View File

@@ -52,7 +52,7 @@ func Start(conf Config, dir http.FileSystem, systemDefaults sd.SystemDefaults) (
return nil, err
}
eventstoreRepos := handler.EventstoreRepos{UserEvents: user}
spool := spooler.StartSpooler(conf.Spooler, es, view, sqlClient, eventstoreRepos, systemDefaults, i18n)
spool := spooler.StartSpooler(conf.Spooler, es, view, sqlClient, eventstoreRepos, systemDefaults, i18n, dir)
return &EsRepository{
spool,

5
internal/notification/repository/eventsourcing/spooler/spooler.go
View File

@@ -9,6 +9,7 @@ import (
"github.com/caos/zitadel/internal/notification/repository/eventsourcing/handler"
"github.com/caos/zitadel/internal/notification/repository/eventsourcing/view"
usr_event "github.com/caos/zitadel/internal/user/repository/eventsourcing"
"net/http"
)
type SpoolerConfig struct {
@@ -22,12 +23,12 @@ type EventstoreRepos struct {
UserEvents *usr_event.UserEventstore
}
func StartSpooler(c SpoolerConfig, es eventstore.Eventstore, view *view.View, sql *sql.DB, eventstoreRepos handler.EventstoreRepos, systemDefaults sd.SystemDefaults, i18n *i18n.Translator) *spooler.Spooler {
func StartSpooler(c SpoolerConfig, es eventstore.Eventstore, view *view.View, sql *sql.DB, eventstoreRepos handler.EventstoreRepos, systemDefaults sd.SystemDefaults, i18n *i18n.Translator, dir http.FileSystem) *spooler.Spooler {
spoolerConfig := spooler.Config{
Eventstore: es,
Locker: &locker{dbClient: sql},
ConcurrentTasks: c.ConcurrentTasks,
ViewHandlers: handler.Register(c.Handlers, c.BulkLimit, c.FailureCountUntilSkip, view, es, eventstoreRepos, systemDefaults, i18n),
ViewHandlers: handler.Register(c.Handlers, c.BulkLimit, c.FailureCountUntilSkip, view, es, eventstoreRepos, systemDefaults, i18n, dir),
}
spool := spoolerConfig.New()
spool.Start()

451
internal/notification/static/templates/template.html Normal file
View File

@@ -0,0 +1,451 @@
<!doctype html>
<html>
<head>
<meta name="viewport" content="width=device-width" />
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>{{.Title}}</title>
<style>
@import url('https://fonts.googleapis.com/css?family=Roboto:300,400&display=swap');
@font-face {
font-family: Ailerons;
src: url("https://www.caos.ch/fonts/Ailerons-Typeface.otf") format("opentype");
}
/* -------------------------------------
GLOBAL RESETS
------------------------------------- */
img {
border: none;
-ms-interpolation-mode: bicubic;
max-width: 100%;
}
body {
background: #222324 url('waves-bottomleft.png') bottom left no-repeat;
background-size: 150px;
font-family: 'Roboto', sans-serif;
font-weight: 300;
-webkit-font-smoothing: antialiased;
font-size: 14px;
line-height: 1.4;
margin: 0;
padding: 0;
-ms-text-size-adjust: 100%;
-webkit-text-size-adjust: 100%;
}
table {
border-collapse: separate;
mso-table-lspace: 0pt;
mso-table-rspace: 0pt;
width: 100%; }
table td {
font-family: 'Roboto', sans-serif;
font-size: 14px;
font-weight: 300;
vertical-align: top;
color: #fff;
}
/* -------------------------------------
BODY & CONTAINER
------------------------------------- */
.body {
background: url('waves-topright.png') top right no-repeat;
background-size: 150px;
width: 100%;
}
/* Set a max-width, and make it display as block so it will automatically stretch to that width, but will also shrink down on a phone or something */
.container {
display: block;
margin: 0 auto !important;
/* makes it centered */
max-width: 580px;
padding: 40px;
width: 580px;
}
/* This should also be a block element, so that it will fill 100% of the .container */
.content {
box-sizing: border-box;
display: block;
margin: 0 auto;
max-width: 580px;
padding: 10px;
}
/* -------------------------------------
HEADER, FOOTER, MAIN
------------------------------------- */
.main {
background: #191919;
width: 100%;
border-radius: 16px;
}
.wrapper {
box-sizing: border-box;
padding: 50px;
}
.content-block {
padding-bottom: 10px;
padding-top: 10px;
}
.footer {
clear: both;
margin-top: 10px;
text-align: center;
width: 100%;
}
.footer td,
.footer p,
.footer span,
.footer a {
color: #999999;
font-size: 12px;
text-align: center;
}
.footer a{
color: #FE00FF;
text-decoration: none;
font-size: 14px;
font-weight: 400;
}
.footer a:hover{
text-decoration: underline;
}
.apple-link{
margin-bottom: 10px;
display: inline-block;
}
/* -------------------------------------
TYPOGRAPHY
------------------------------------- */
h1,
h2,
h3,
h4 {
color: #fff;
font-family: 'Roboto', sans-serif;
font-weight: 300;
line-height: 1.4;
margin: 0;
margin-bottom: 30px;
}
h1 {
font-size: 35px;
font-weight: 300;
text-align: center;
text-transform: capitalize;
}
p,
ul,
ol {
font-family: 'Roboto', sans-serif;
font-size: 14px;
font-weight: 300;
margin: 0;
margin-bottom: 15px;
}
p li,
ul li,
ol li {
list-style-position: inside;
margin-left: 5px;
}
a {
color: #0FBDA6;
text-decoration: underline;
}
/* -------------------------------------
BUTTONS
------------------------------------- */
.btn {
box-sizing: border-box;
width: 100%; }
.btn > tbody > tr > td {
padding-bottom: 15px; }
.btn table {
width: auto;
}
.btn table td {
background-color: #ffffff;
border-radius: 5px;
text-align: center;
}
.btn a {
background-color: #ffffff;
border: solid 1px #0FBDA6;
border-radius: 5px;
box-sizing: border-box;
color: #0FBDA6;
cursor: pointer;
display: inline-block;
font-size: 14px;
font-weight: 400;
margin: 0;
padding: 20px 60px;
text-decoration: none;
}
.btn-primary {
margin-top: 50px;
}
.btn-primary table td {
background-color: #0FBDA6;
}
.btn-primary a {
background-color: #0FBDA6;
border-color: #0FBDA6;
color: #ffffff;
}
/* -------------------------------------
OTHER STYLES THAT MIGHT BE USEFUL
------------------------------------- */
.mheader {
background-color: #131313;
}
.headercell {
color: #FFFFFF;
}
.headertitle{
padding: 30px 30px 70px;
margin: 0;
font-size: 42px;
font-family: 'Ailerons', sans-serif;
text-align: center;
}
.logo{
height: 50px;
margin: 10px;
margin-left: 30px;
}
.hello {
font-size: 22px;
}
.last {
margin-bottom: 0;
}
.first {
margin-top: 0;
}
.align-center {
text-align: center;
}
.align-right {
text-align: right;
}
.align-left {
text-align: left;
}
.clear {
clear: both;
}
.mt0 {
margin-top: 0;
}
.mb0 {
margin-bottom: 0;
}
.preheader {
color: transparent;
display: none;
height: 0;
max-height: 0;
max-width: 0;
opacity: 0;
overflow: hidden;
mso-hide: all;
visibility: hidden;
width: 0;
}
.subject {
color: transparent;
display: none;
height: 0;
max-height: 0;
max-width: 0;
opacity: 0;
overflow: hidden;
mso-hide: all;
visibility: hidden;
width: 0;
}
.powered-by a {
text-decoration: none;
}
hr {
border: 0;
border-bottom: 1px solid #f6f6f6;
margin: 20px 0;
}
/* -------------------------------------
RESPONSIVE AND MOBILE FRIENDLY STYLES
------------------------------------- */
@media only screen and (max-width: 620px) {
table[class=body] h1 {
font-size: 28px !important;
margin-bottom: 10px !important;
}
table[class=body] p,
table[class=body] ul,
table[class=body] ol,
table[class=body] td,
table[class=body] span,
table[class=body] a {
font-size: 16px !important;
}
table[class=body] .wrapper,
table[class=body] .article {
padding: 10px !important;
}
table[class=body] .content {
padding: 0 !important;
}
table[class=body] .container {
padding: 0 !important;
width: 100% !important;
}
table[class=body] .main {
border-left-width: 0 !important;
border-radius: 0 !important;
border-right-width: 0 !important;
}
table[class=body] .btn table {
width: 100% !important;
}
table[class=body] .btn a {
width: 100% !important;
}
table[class=body] .img-responsive {
height: auto !important;
max-width: 100% !important;
width: auto !important;
}
}
/* -------------------------------------
PRESERVE THESE STYLES IN THE HEAD
------------------------------------- */
@media all {
.ExternalClass {
width: 100%;
}
.ExternalClass,
.ExternalClass p,
.ExternalClass span,
.ExternalClass font,
.ExternalClass td,
.ExternalClass div {
line-height: 100%;
}
.apple-link a {
color: inherit !important;
font-family: inherit !important;
font-size: inherit !important;
font-weight: inherit !important;
line-height: inherit !important;
text-decoration: none !important;
}
.btn-primary table td:hover {
background-color: #1ADFC5 !important;
}
.btn-primary a:hover {
background-color: #1ADFC5 !important;
border-color: #1ADFC5 !important;
}
}
</style>
</head>
<body class="">
<span class="preheader">{{.PreHeader}}</span>
<span class="subject">{{.Subject}}</span>
<table role="pheader" class="mheader" border="0" cellpadding="0" cellspacing="0">
<tr>
<td class="mheadercell">
</td>
<td class="logo">
<img class="logo" src="https://caos.ch/images/LogoCaos.png" alt="CAOS AG - Logo">
</td>
</tr>
</table>
<table role="presentation" border="0" cellpadding="0" cellspacing="0" class="body">
<tr>
<td></td>
<td class="container">
<div class="content">
<!-- START CENTERED WHITE CONTAINER -->
<table role="pheader" class="tableheader" border="0" cellpadding="0" cellspacing="0">
<tr>
<td class="headercell">
<p class="headertitle">Zitadel</p>
</td>
</tr>
</table>
<table role="presentation" class="main">
<!-- START MAIN CONTENT AREA -->
<tr>
<td class="wrapper">
<table role="presentation" class="maincontent" border="0" cellpadding="0" cellspacing="0">
<tr>
<td>
<p class="hello">{{.Greeting}}</p>
<p>{{.Text}}</p>
<table role="presentation" border="0" cellpadding="0" cellspacing="0" class="btn btn-primary">
<tbody>
<tr>
<td align="center">
<table role="presentation" border="0" cellpadding="0" cellspacing="0">
<tbody>
<tr>
<td> <a href="{{.URL}}" target="_blank">{{.ButtonText}}</a> </td>
</tr>
</tbody>
</table>
</td>
</tr>
</tbody>
</table>
</td>
</tr>
</table>
</td>
</tr>
<!-- END MAIN CONTENT AREA -->
</table>
<!-- END CENTERED WHITE CONTAINER -->
<!-- START FOOTER -->
<div class="footer">
<table role="presentation" border="0" cellpadding="0" cellspacing="0">
<tr>
<td class="content-block">
<span class="apple-link">CAOS AG &nbsp;&nbsp; | &nbsp;&nbsp; Teufener Strasse 19 &nbsp;&nbsp; | &nbsp;&nbsp; CH-9000 St.Gallen</span>
<br> <a href="http://www.caos.ch">caos.ch</a>.
</td>
</tr>
</table>
</div>
<!-- END FOOTER -->
</div>
</td>
<td>&nbsp;</td>
</tr>
</table>
</body>
</html>

28
internal/notification/templates/template.go
View File

@@ -3,25 +3,28 @@ package templates
import (
"bytes"
"html/template"
"io/ioutil"
"net/http"
)
const (
templatesPath = "/templates"
templateFileName = "template.html"
)
func GetParsedTemplate(contentData interface{}) (string, error) {
template, err := ParseTemplateFile("", contentData)
func GetParsedTemplate(dir http.FileSystem, contentData interface{}) (string, error) {
template, err := ParseTemplateFile(dir, "", contentData)
if err != nil {
return "", err
}
return ParseTemplateText(template, contentData)
}
func ParseTemplateFile(fileName string, data interface{}) (string, error) {
func ParseTemplateFile(dir http.FileSystem, fileName string, data interface{}) (string, error) {
if fileName == "" {
fileName = templateFileName
}
template, err := template.ParseFiles(fileName)
template, err := readFile(dir, fileName)
if err != nil {
return "", err
}
@@ -43,3 +46,20 @@ func parseTemplate(template *template.Template, data interface{}) (string, error
}
return buf.String(), nil
}
func readFile(dir http.FileSystem, fileName string) (*template.Template, error) {
f, err := dir.Open(templatesPath + "/" + fileName)
if err != nil {
return nil, err
}
defer f.Close()
content, err := ioutil.ReadAll(f)
if err != nil {
return nil, err
}
tmpl, err := template.New(fileName).Parse(string(content))
if err != nil {
return nil, err
}
return tmpl, nil
}

5
internal/notification/types/email_verification_code.go
View File

@@ -7,6 +7,7 @@ import (
"github.com/caos/zitadel/internal/notification/templates"
es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model"
view_model "github.com/caos/zitadel/internal/user/repository/view/model"
"net/http"
)
type EmailVerificationCodeData struct {
@@ -14,7 +15,7 @@ type EmailVerificationCodeData struct {
URL string
}
func SendEmailVerificationCode(i18n *i18n.Translator, user *view_model.NotifyUser, code *es_model.EmailCode, systemDefaults systemdefaults.SystemDefaults, alg crypto.EncryptionAlgorithm) error {
func SendEmailVerificationCode(dir http.FileSystem, i18n *i18n.Translator, user *view_model.NotifyUser, code *es_model.EmailCode, systemDefaults systemdefaults.SystemDefaults, alg crypto.EncryptionAlgorithm) error {
codeString, err := crypto.DecryptString(code.Code, alg)
if err != nil {
return err
@@ -31,7 +32,7 @@ func SendEmailVerificationCode(i18n *i18n.Translator, user *view_model.NotifyUse
systemDefaults.Notifications.TemplateData.VerifyEmail.Translate(i18n, args, user.PreferredLanguage)
emailCodeData := &EmailVerificationCodeData{TemplateData: systemDefaults.Notifications.TemplateData.VerifyEmail, URL: url}
template, err := templates.GetParsedTemplate(emailCodeData)
template, err := templates.GetParsedTemplate(dir, emailCodeData)
if err != nil {
return err
}

5
internal/notification/types/init_code.go
View File

@@ -7,6 +7,7 @@ import (
"github.com/caos/zitadel/internal/notification/templates"
es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model"
view_model "github.com/caos/zitadel/internal/user/repository/view/model"
"net/http"
)
type InitCodeEmailData struct {
@@ -19,7 +20,7 @@ type UrlData struct {
Code string
}
func SendUserInitCode(i18n *i18n.Translator, user *view_model.NotifyUser, code *es_model.InitUserCode, systemDefaults systemdefaults.SystemDefaults, alg crypto.EncryptionAlgorithm) error {
func SendUserInitCode(dir http.FileSystem, i18n *i18n.Translator, user *view_model.NotifyUser, code *es_model.InitUserCode, systemDefaults systemdefaults.SystemDefaults, alg crypto.EncryptionAlgorithm) error {
codeString, err := crypto.DecryptString(code.Code, alg)
if err != nil {
return err
@@ -36,7 +37,7 @@ func SendUserInitCode(i18n *i18n.Translator, user *view_model.NotifyUser, code *
systemDefaults.Notifications.TemplateData.InitCode.Translate(i18n, args, user.PreferredLanguage)
initCodeData := &InitCodeEmailData{TemplateData: systemDefaults.Notifications.TemplateData.InitCode, URL: url}
template, err := templates.GetParsedTemplate(initCodeData)
template, err := templates.GetParsedTemplate(dir, initCodeData)
if err != nil {
return err
}

5
internal/notification/types/password_code.go
View File

@@ -7,6 +7,7 @@ import (
"github.com/caos/zitadel/internal/notification/templates"
es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model"
view_model "github.com/caos/zitadel/internal/user/repository/view/model"
"net/http"
)
type PasswordCodeData struct {
@@ -16,7 +17,7 @@ type PasswordCodeData struct {
URL string
}
func SendPasswordCode(i18n *i18n.Translator, user *view_model.NotifyUser, code *es_model.PasswordCode, systemDefaults systemdefaults.SystemDefaults, alg crypto.EncryptionAlgorithm) error {
func SendPasswordCode(dir http.FileSystem, i18n *i18n.Translator, user *view_model.NotifyUser, code *es_model.PasswordCode, systemDefaults systemdefaults.SystemDefaults, alg crypto.EncryptionAlgorithm) error {
codeString, err := crypto.DecryptString(code.Code, alg)
if err != nil {
return err
@@ -33,7 +34,7 @@ func SendPasswordCode(i18n *i18n.Translator, user *view_model.NotifyUser, code *
systemDefaults.Notifications.TemplateData.PasswordReset.Translate(i18n, args, user.PreferredLanguage)
passwordCodeData := &PasswordCodeData{TemplateData: systemDefaults.Notifications.TemplateData.PasswordReset, FirstName: user.FirstName, LastName: user.LastName, URL: url}
template, err := templates.GetParsedTemplate(passwordCodeData)
template, err := templates.GetParsedTemplate(dir, passwordCodeData)
if err != nil {
return err
}