- - Organization: {{.Organization}}
- - Website: {{.Website}}
+ - ScienceMesh Site: {{getSiteName .Site false}} ({{getSiteName .Site true}})
- Role: {{.Role}}
- Phone: {{.PhoneNumber}}
diff --git a/pkg/siteacc/alerting/dispatcher.go b/pkg/siteacc/alerting/dispatcher.go
new file mode 100644
index 0000000000..b8724079a6
--- /dev/null
+++ b/pkg/siteacc/alerting/dispatcher.go
@@ -0,0 +1,109 @@
+// Copyright 2018-2020 CERN
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// In applying this license, CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+package alerting
+
+import (
+ "strings"
+
+ "github.com/cs3org/reva/pkg/siteacc/config"
+ "github.com/cs3org/reva/pkg/siteacc/data"
+ "github.com/cs3org/reva/pkg/siteacc/email"
+ "github.com/cs3org/reva/pkg/smtpclient"
+ "github.com/pkg/errors"
+ "github.com/prometheus/alertmanager/template"
+ "github.com/rs/zerolog"
+)
+
+// Dispatcher is used to dispatch Prometheus alerts via email.
+type Dispatcher struct {
+ conf *config.Configuration
+ log *zerolog.Logger
+
+ smtp *smtpclient.SMTPCredentials
+}
+
+func (dispatcher *Dispatcher) initialize(conf *config.Configuration, log *zerolog.Logger) error {
+ if conf == nil {
+ return errors.Errorf("no configuration provided")
+ }
+ dispatcher.conf = conf
+
+ if log == nil {
+ return errors.Errorf("no logger provided")
+ }
+ dispatcher.log = log
+
+ // Create the SMTP client
+ if conf.Email.SMTP != nil {
+ dispatcher.smtp = smtpclient.NewSMTPCredentials(conf.Email.SMTP)
+ }
+
+ return nil
+}
+
+// DispatchAlerts sends the provided alert(s) via email to the appropriate recipients.
+func (dispatcher *Dispatcher) DispatchAlerts(alerts *template.Data, accounts data.Accounts) error {
+ for _, alert := range alerts.Alerts {
+ siteID, ok := alert.Labels["site_id"]
+ if !ok {
+ continue
+ }
+
+ // Dispatch the alert to all accounts configured to receive it
+ for _, account := range accounts {
+ if strings.EqualFold(account.Site, siteID) && account.Settings.ReceiveAlerts {
+ if err := dispatcher.dispatchAlert(alert, account); err != nil {
+ // Log errors only
+ dispatcher.log.Err(err).Str("id", alert.Fingerprint).Str("recipient", account.Email).Msg("unable to dispatch alert to user")
+ }
+ }
+ }
+ }
+ return nil
+}
+
+func (dispatcher *Dispatcher) dispatchAlert(alert template.Alert, account *data.Account) error {
+ alertValues := map[string]string{
+ "Status": alert.Status,
+ "StartDate": alert.StartsAt.String(),
+ "EndDate": alert.EndsAt.String(),
+ "Fingerprint": alert.Fingerprint,
+
+ "Name": alert.Labels["alertname"],
+ "Instance": alert.Labels["instance"],
+ "Job": alert.Labels["job"],
+ "Severity": alert.Labels["severity"],
+ "Site": alert.Labels["site"],
+ "SiteID": alert.Labels["site_id"],
+
+ "Description": alert.Annotations["description"],
+ "Summary": alert.Annotations["summary"],
+ }
+
+ return email.SendAlertNotification(account, []string{account.Email, dispatcher.conf.Email.NotificationsMail}, alertValues, *dispatcher.conf)
+}
+
+// NewDispatcher creates a new dispatcher instance.
+func NewDispatcher(conf *config.Configuration, log *zerolog.Logger) (*Dispatcher, error) {
+ dispatcher := &Dispatcher{}
+ if err := dispatcher.initialize(conf, log); err != nil {
+ return nil, errors.Wrapf(err, "unable to initialize the alerts dispatcher")
+ }
+ return dispatcher, nil
+}
diff --git a/pkg/siteacc/config/config.go b/pkg/siteacc/config/config.go
index 639e74c893..ba746f018d 100644
--- a/pkg/siteacc/config/config.go
+++ b/pkg/siteacc/config/config.go
@@ -41,9 +41,11 @@ type Configuration struct {
NotificationsMail string `mapstructure:"notifications_mail"`
} `mapstructure:"email"`
- SiteRegistration struct {
- URL string `mapstructure:"url"`
- } `mapstructure:"sitereg"`
+ Mentix struct {
+ URL string `mapstructure:"url"`
+ DataEndpoint string `mapstructure:"data_endpoint"`
+ SiteRegistrationEndpoint string `mapstructure:"sitereg_endpoint"`
+ } `mapstructure:"mentix"`
Webserver struct {
URL string `mapstructure:"url"`
diff --git a/pkg/siteacc/config/endpoints.go b/pkg/siteacc/config/endpoints.go
index feef521aab..9559f135d8 100644
--- a/pkg/siteacc/config/endpoints.go
+++ b/pkg/siteacc/config/endpoints.go
@@ -40,6 +40,8 @@ const (
EndpointCreate = "/create"
// EndpointUpdate is the endpoint path for account updates.
EndpointUpdate = "/update"
+ // EndpointConfigure is the endpoint path for account configuration.
+ EndpointConfigure = "/configure"
// EndpointRemove is the endpoint path for account removal.
EndpointRemove = "/remove"
@@ -65,4 +67,7 @@ const (
// EndpointUnregisterSite is the endpoint path for site unregistration.
EndpointUnregisterSite = "/unregister-site"
+
+ // EndpointDispatchAlert is the endpoint path for dispatching alerts from Prometheus.
+ EndpointDispatchAlert = "/dispatch-alert"
)
diff --git a/pkg/siteacc/data/account.go b/pkg/siteacc/data/account.go
index 67cd5336a1..1279ac8bc8 100644
--- a/pkg/siteacc/data/account.go
+++ b/pkg/siteacc/data/account.go
@@ -31,21 +31,21 @@ import (
// Account represents a single site account.
type Account struct {
- Email string `json:"email"`
- Title string `json:"title"`
- FirstName string `json:"firstName"`
- LastName string `json:"lastName"`
- Organization string `json:"organization"`
- Website string `json:"website"`
- Role string `json:"role"`
- PhoneNumber string `json:"phoneNumber"`
+ Email string `json:"email"`
+ Title string `json:"title"`
+ FirstName string `json:"firstName"`
+ LastName string `json:"lastName"`
+ Site string `json:"site"`
+ Role string `json:"role"`
+ PhoneNumber string `json:"phoneNumber"`
Password password.Password `json:"password"`
DateCreated time.Time `json:"dateCreated"`
DateModified time.Time `json:"dateModified"`
- Data AccountData `json:"data"`
+ Data AccountData `json:"data"`
+ Settings AccountSettings `json:"settings"`
}
// AccountData holds additional data for a site account.
@@ -55,6 +55,11 @@ type AccountData struct {
Authorized bool `json:"authorized"`
}
+// AccountSettings holds additional settings for a site account.
+type AccountSettings struct {
+ ReceiveAlerts bool `json:"receiveAlerts"`
+}
+
// Accounts holds an array of site accounts.
type Accounts = []*Account
@@ -69,7 +74,7 @@ func (acc *Account) GetSiteID() key.SiteIdentifier {
// Update copies the data of the given account to this account.
func (acc *Account) Update(other *Account, setPassword bool, copyData bool) error {
- if err := other.verify(false); err != nil {
+ if err := other.verify(false, false); err != nil {
return errors.Wrap(err, "unable to update account data")
}
@@ -77,8 +82,6 @@ func (acc *Account) Update(other *Account, setPassword bool, copyData bool) erro
acc.Title = other.Title
acc.FirstName = other.FirstName
acc.LastName = other.LastName
- acc.Organization = other.Organization
- acc.Website = other.Website
acc.Role = other.Role
acc.PhoneNumber = other.PhoneNumber
@@ -96,6 +99,14 @@ func (acc *Account) Update(other *Account, setPassword bool, copyData bool) erro
return nil
}
+// Configure copies the settings of the given account to this account.
+func (acc *Account) Configure(other *Account) error {
+ // Simply copy the stored settings
+ acc.Settings = other.Settings
+
+ return nil
+}
+
// UpdatePassword assigns a new password to the account, hashing it first.
func (acc *Account) UpdatePassword(pwd string) error {
if err := acc.Password.Set(pwd); err != nil {
@@ -136,13 +147,12 @@ func (acc *Account) Cleanup() {
acc.Title = strings.TrimSpace(acc.Title)
acc.FirstName = strings.TrimSpace(acc.FirstName)
acc.LastName = strings.TrimSpace(acc.LastName)
- acc.Organization = strings.TrimSpace(acc.Organization)
- acc.Website = strings.TrimSpace(acc.Website)
+ acc.Site = strings.TrimSpace(acc.Site)
acc.Role = strings.TrimSpace(acc.Role)
acc.PhoneNumber = strings.TrimSpace(acc.PhoneNumber)
}
-func (acc *Account) verify(verifyPassword bool) error {
+func (acc *Account) verify(isNewAccount, verifyPassword bool) error {
if acc.Email == "" {
return errors.Errorf("no email address provided")
} else if !utils.IsEmailValid(acc.Email) {
@@ -161,14 +171,8 @@ func (acc *Account) verify(verifyPassword bool) error {
return errors.Errorf("last name contains invalid characters: %v", acc.LastName)
}
- if acc.Organization == "" {
- return errors.Errorf("no organization provided")
- } else if !utils.IsValidName(acc.Organization) {
- return errors.Errorf("organization contains invalid characters: %v", acc.Organization)
- }
-
- if acc.Website != "" && !utils.IsValidWebAddress(acc.Website) {
- return errors.Errorf("invalid website provided")
+ if isNewAccount && acc.Site == "" {
+ return errors.Errorf("no site provided")
}
if acc.Role == "" {
@@ -191,7 +195,7 @@ func (acc *Account) verify(verifyPassword bool) error {
}
// NewAccount creates a new site account.
-func NewAccount(email string, title, firstName, lastName string, organization, website string, role string, phoneNumber string, password string) (*Account, error) {
+func NewAccount(email string, title, firstName, lastName string, site, role string, phoneNumber string, password string) (*Account, error) {
t := time.Now()
acc := &Account{
@@ -199,8 +203,7 @@ func NewAccount(email string, title, firstName, lastName string, organization, w
Title: title,
FirstName: firstName,
LastName: lastName,
- Organization: organization,
- Website: website,
+ Site: site,
Role: role,
PhoneNumber: phoneNumber,
DateCreated: t,
@@ -210,6 +213,9 @@ func NewAccount(email string, title, firstName, lastName string, organization, w
GOCDBAccess: false,
Authorized: false,
},
+ Settings: AccountSettings{
+ ReceiveAlerts: false,
+ },
}
// Set the user password, which also makes sure that the given password is strong enough
@@ -217,7 +223,7 @@ func NewAccount(email string, title, firstName, lastName string, organization, w
return nil, err
}
- if err := acc.verify(true); err != nil {
+ if err := acc.verify(true, true); err != nil {
return nil, err
}
diff --git a/pkg/siteacc/data/sites.go b/pkg/siteacc/data/sites.go
new file mode 100644
index 0000000000..ab64130d84
--- /dev/null
+++ b/pkg/siteacc/data/sites.go
@@ -0,0 +1,91 @@
+// Copyright 2018-2020 CERN
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// In applying this license, CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+package data
+
+import (
+ "encoding/json"
+ "fmt"
+ "sort"
+
+ "github.com/cs3org/reva/pkg/mentix/utils/network"
+ "github.com/pkg/errors"
+)
+
+// SiteInformation holds the most basic information about a site.
+type SiteInformation struct {
+ ID string
+ Name string
+ FullName string
+}
+
+// QueryAvailableSites uses Mentix to query a list of all available (registered) sites.
+func QueryAvailableSites(mentixHost, dataEndpoint string) ([]SiteInformation, error) {
+ mentixURL, err := network.GenerateURL(mentixHost, dataEndpoint, network.URLParams{})
+ if err != nil {
+ return nil, errors.Wrap(err, "unable to generate Mentix URL")
+ }
+
+ data, err := network.ReadEndpoint(mentixURL, nil, true)
+ if err != nil {
+ return nil, errors.Wrap(err, "unable to read the Mentix endpoint")
+ }
+
+ // Decode the data into a simplified, reduced data type
+ type siteData struct {
+ Sites []SiteInformation
+ }
+ sites := siteData{}
+ if err := json.Unmarshal(data, &sites); err != nil {
+ fmt.Println(err)
+ return nil, errors.Wrap(err, "error while decoding the JSON data")
+ }
+
+ // Sort the sites alphabetically by their names
+ sort.Slice(sites.Sites, func(i, j int) bool {
+ return sites.Sites[i].Name < sites.Sites[j].Name
+ })
+
+ return sites.Sites, nil
+}
+
+// QuerySiteName uses Mentix to query the name of a site given by its ID.
+func QuerySiteName(siteID string, fullName bool, mentixHost, dataEndpoint string) (string, error) {
+ sites, err := QueryAvailableSites(mentixHost, dataEndpoint)
+ if err != nil {
+ return "", err
+ }
+
+ index := len(sites)
+ for i, site := range sites {
+ if site.ID == siteID {
+ index = i
+ break
+ }
+ }
+
+ if index != len(sites) {
+ if fullName {
+ return sites[index].FullName, nil
+ }
+
+ return sites[index].Name, nil
+ }
+
+ return "", errors.Errorf("no site with ID %v found", siteID)
+}
diff --git a/pkg/siteacc/email/email.go b/pkg/siteacc/email/email.go
index a8ef373b8b..9c73f47307 100644
--- a/pkg/siteacc/email/email.go
+++ b/pkg/siteacc/email/email.go
@@ -20,6 +20,7 @@ package email
import (
"bytes"
+ "strings"
"text/template"
"github.com/cs3org/reva/pkg/siteacc/config"
@@ -79,6 +80,17 @@ func SendContactForm(account *data.Account, recipients []string, params map[stri
return send(recipients, "ScienceMesh: Contact form", contactFormTemplate, getEmailData(account, conf, params), conf.Email.SMTP)
}
+// SendAlertNotification sends an alert via email.
+func SendAlertNotification(account *data.Account, recipients []string, params map[string]string, conf config.Configuration) error {
+ subject := params["Summary"]
+ tpl := alertFiringNotificationTemplate
+ if strings.EqualFold(params["Status"], "resolved") {
+ tpl = alertResolvedNotificationTemplate
+ subject += " [RESOLVED]"
+ }
+ return send(recipients, "ScienceMesh Alert: "+subject, tpl, getEmailData(account, conf, params), conf.Email.SMTP)
+}
+
func send(recipients []string, subject string, bodyTemplate string, data interface{}, smtp *smtpclient.SMTPCredentials) error {
// Do not fail if no SMTP client or recipient is given
if smtp == nil {
@@ -86,6 +98,8 @@ func send(recipients []string, subject string, bodyTemplate string, data interfa
}
tpl := template.New("email")
+ prepareEmailTemplate(tpl)
+
if _, err := tpl.Parse(bodyTemplate); err != nil {
return errors.Wrap(err, "error while parsing email template")
}
@@ -108,3 +122,18 @@ func send(recipients []string, subject string, bodyTemplate string, data interfa
return nil
}
+
+func prepareEmailTemplate(tpl *template.Template) {
+ // Add some custom helper functions to the template
+ tpl.Funcs(template.FuncMap{
+ "indent": func(n int, s string) string {
+ lines := make([]string, 0, 10)
+ for _, line := range strings.Split(s, "\n") {
+ line = strings.TrimSpace(line)
+ line = strings.Repeat(" ", n) + line
+ lines = append(lines, line)
+ }
+ return strings.Join(lines, "\n")
+ },
+ })
+}
diff --git a/pkg/siteacc/email/template.go b/pkg/siteacc/email/template.go
index 3992a56052..3f3bf8e026 100644
--- a/pkg/siteacc/email/template.go
+++ b/pkg/siteacc/email/template.go
@@ -87,3 +87,29 @@ const contactFormTemplate = `
{{.Params.Message}}
`
+
+const alertFiringNotificationTemplate = `
+Site {{.Params.Site}} has generated an alert:
+
+ Type: {{.Params.Name}}
+ Instance: {{.Params.Instance}}
+ Job: {{.Params.Job}}
+ Severity: {{.Params.Severity}}
+
+{{.Params.Description | indent 2}}
+
+{{.Params.StartDate}} ({{.Params.Fingerprint}})
+`
+
+const alertResolvedNotificationTemplate = `
+Site {{.Params.Site}} has resolved an alert:
+
+ Type: {{.Params.Name}}
+ Instance: {{.Params.Instance}}
+ Job: {{.Params.Job}}
+ Severity: {{.Params.Severity}}
+
+{{.Params.Description | indent 2}}
+
+{{.Params.StartDate}} - {{.Params.EndDate}} ({{.Params.Fingerprint}})
+`
diff --git a/pkg/siteacc/endpoints.go b/pkg/siteacc/endpoints.go
index 9a09f7efe2..23fd36197c 100644
--- a/pkg/siteacc/endpoints.go
+++ b/pkg/siteacc/endpoints.go
@@ -32,6 +32,7 @@ import (
"github.com/cs3org/reva/pkg/siteacc/html"
"github.com/cs3org/reva/pkg/siteacc/manager"
"github.com/pkg/errors"
+ "github.com/prometheus/alertmanager/template"
)
const (
@@ -75,13 +76,14 @@ func getEndpoints() []endpoint {
{config.EndpointList, callMethodEndpoint, createMethodCallbacks(handleList, nil), false},
{config.EndpointFind, callMethodEndpoint, createMethodCallbacks(handleFind, nil), false},
{config.EndpointCreate, callMethodEndpoint, createMethodCallbacks(nil, handleCreate), true},
- {config.EndpointUpdate, callMethodEndpoint, createMethodCallbacks(nil, handleUpdate), true},
+ {config.EndpointUpdate, callMethodEndpoint, createMethodCallbacks(nil, handleUpdate), false},
+ {config.EndpointConfigure, callMethodEndpoint, createMethodCallbacks(nil, handleConfigure), false},
{config.EndpointRemove, callMethodEndpoint, createMethodCallbacks(nil, handleRemove), false},
// Login endpoints
{config.EndpointLogin, callMethodEndpoint, createMethodCallbacks(nil, handleLogin), true},
{config.EndpointLogout, callMethodEndpoint, createMethodCallbacks(handleLogout, nil), true},
- {config.EndpointResetPassword, callMethodEndpoint, createMethodCallbacks(nil, handleResetPassword), true},
- {config.EndpointContact, callMethodEndpoint, createMethodCallbacks(nil, handleContact), true},
+ {config.EndpointResetPassword, callMethodEndpoint, createMethodCallbacks(nil, handleResetPassword), false},
+ {config.EndpointContact, callMethodEndpoint, createMethodCallbacks(nil, handleContact), false},
// Authentication endpoints
{config.EndpointVerifyUserToken, callMethodEndpoint, createMethodCallbacks(handleVerifyUserToken, nil), true},
// Authorization endpoints
@@ -89,6 +91,8 @@ func getEndpoints() []endpoint {
{config.EndpointIsAuthorized, callMethodEndpoint, createMethodCallbacks(handleIsAuthorized, nil), false},
// Access management endpoints
{config.EndpointGrantGOCDBAccess, callMethodEndpoint, createMethodCallbacks(nil, handleGrantGOCDBAccess), false},
+ // Alerting endpoints
+ {config.EndpointDispatchAlert, callMethodEndpoint, createMethodCallbacks(nil, handleDispatchAlert), false},
// Account site endpoints
{config.EndpointUnregisterSite, callMethodEndpoint, createMethodCallbacks(nil, handleUnregisterSite), false},
}
@@ -245,38 +249,35 @@ func handleUpdate(siteacc *SiteAccounts, values url.Values, body []byte, session
return nil, err
}
- setPassword := false
-
- switch strings.ToLower(values.Get("invoker")) {
- case invokerDefault:
- // If the endpoint was called through the API, an API key must be provided identifying the account
- apiKey := values.Get("apikey")
- if apiKey == "" {
- return nil, errors.Errorf("no API key provided")
- }
+ email, setPassword, err := processInvoker(siteacc, values, session)
+ if err != nil {
+ return nil, err
+ }
+ account.Email = email
- accountFound, err := findAccount(siteacc, manager.FindByAPIKey, apiKey)
- if err != nil {
- return nil, errors.Wrap(err, "no account for the specified API key found")
- }
- account.Email = accountFound.Email
+ // Update the account through the accounts manager
+ if err := siteacc.AccountsManager().UpdateAccount(account, setPassword, false); err != nil {
+ return nil, errors.Wrap(err, "unable to update account")
+ }
- case invokerUser:
- // If this endpoint was called by the user, set the account email from the stored session
- if session.LoggedInUser == nil {
- return nil, errors.Errorf("no user is currently logged in")
- }
+ return nil, nil
+}
- account.Email = session.LoggedInUser.Email
- setPassword = true
+func handleConfigure(siteacc *SiteAccounts, values url.Values, body []byte, session *html.Session) (interface{}, error) {
+ account, err := unmarshalRequestData(body)
+ if err != nil {
+ return nil, err
+ }
- default:
- return nil, errors.Errorf("no invoker provided")
+ email, _, err := processInvoker(siteacc, values, session)
+ if err != nil {
+ return nil, err
}
+ account.Email = email
- // Update the account through the accounts manager
- if err := siteacc.AccountsManager().UpdateAccount(account, setPassword, false); err != nil {
- return nil, errors.Wrap(err, "unable to update account")
+ // Configure the account through the accounts manager
+ if err := siteacc.AccountsManager().ConfigureAccount(account); err != nil {
+ return nil, errors.Wrap(err, "unable to configure account")
}
return nil, nil
@@ -422,6 +423,20 @@ func handleAuthorize(siteacc *SiteAccounts, values url.Values, body []byte, sess
return nil, nil
}
+func handleDispatchAlert(siteacc *SiteAccounts, values url.Values, body []byte, session *html.Session) (interface{}, error) {
+ alertsData := &template.Data{}
+ if err := json.Unmarshal(body, alertsData); err != nil {
+ return nil, errors.Wrap(err, "unable to unmarshal the alerts data")
+ }
+
+ // Dispatch the alerts using the alerts dispatcher
+ if err := siteacc.AlertsDispatcher().DispatchAlerts(alertsData, siteacc.AccountsManager().CloneAccounts(true)); err != nil {
+ return nil, errors.Wrap(err, "error while dispatching the alerts")
+ }
+
+ return nil, nil
+}
+
func handleGrantGOCDBAccess(siteacc *SiteAccounts, values url.Values, body []byte, session *html.Session) (interface{}, error) {
account, err := unmarshalRequestData(body)
if err != nil {
@@ -473,3 +488,38 @@ func findAccount(siteacc *SiteAccounts, by string, value string) (*data.Account,
}
return account, nil
}
+
+func processInvoker(siteacc *SiteAccounts, values url.Values, session *html.Session) (string, bool, error) {
+ var email string
+ var invokedByUser bool
+
+ switch strings.ToLower(values.Get("invoker")) {
+ case invokerDefault:
+ // If the endpoint was called through the API, an API key must be provided identifying the account
+ apiKey := values.Get("apikey")
+ if apiKey == "" {
+ return "", false, errors.Errorf("no API key provided")
+ }
+
+ accountFound, err := findAccount(siteacc, manager.FindByAPIKey, apiKey)
+ if err != nil {
+ return "", false, errors.Wrap(err, "no account for the specified API key found")
+ }
+ email = accountFound.Email
+ invokedByUser = false
+
+ case invokerUser:
+ // If this endpoint was called by the user, set the account email from the stored session
+ if session.LoggedInUser == nil {
+ return "", false, errors.Errorf("no user is currently logged in")
+ }
+
+ email = session.LoggedInUser.Email
+ invokedByUser = true
+
+ default:
+ return "", false, errors.Errorf("no invoker provided")
+ }
+
+ return email, invokedByUser, nil
+}
diff --git a/pkg/siteacc/html/panel.go b/pkg/siteacc/html/panel.go
index 91aa7a26ea..a70c55aadd 100644
--- a/pkg/siteacc/html/panel.go
+++ b/pkg/siteacc/html/panel.go
@@ -24,6 +24,7 @@ import (
"strings"
"github.com/cs3org/reva/pkg/siteacc/config"
+ "github.com/cs3org/reva/pkg/siteacc/data"
"github.com/pkg/errors"
"github.com/rs/zerolog"
)
@@ -148,6 +149,10 @@ func (panel *Panel) prepareTemplate(tpl *template.Template) {
"getServerAddress": func() string {
return strings.TrimRight(panel.conf.Webserver.URL, "/")
},
+ "getSiteName": func(siteID string, fullName bool) string {
+ siteName, _ := data.QuerySiteName(siteID, fullName, panel.conf.Mentix.URL, panel.conf.Mentix.DataEndpoint)
+ return siteName
+ },
})
}
diff --git a/pkg/siteacc/manager/accmanager.go b/pkg/siteacc/manager/accmanager.go
index c92f3212e1..4131c7972c 100644
--- a/pkg/siteacc/manager/accmanager.go
+++ b/pkg/siteacc/manager/accmanager.go
@@ -19,6 +19,7 @@
package manager
import (
+ "path"
"strings"
"sync"
"time"
@@ -164,7 +165,7 @@ func (mngr *AccountsManager) CreateAccount(accountData *data.Account) error {
return errors.Errorf("an account with the specified email address already exists")
}
- if account, err := data.NewAccount(accountData.Email, accountData.Title, accountData.FirstName, accountData.LastName, accountData.Organization, accountData.Website, accountData.Role, accountData.PhoneNumber, accountData.Password.Value); err == nil {
+ if account, err := data.NewAccount(accountData.Email, accountData.Title, accountData.FirstName, accountData.LastName, accountData.Site, accountData.Role, accountData.PhoneNumber, accountData.Password.Value); err == nil {
mngr.accounts = append(mngr.accounts, account)
mngr.storage.AccountAdded(account)
mngr.writeAllAccounts()
@@ -202,6 +203,30 @@ func (mngr *AccountsManager) UpdateAccount(accountData *data.Account, setPasswor
return nil
}
+// ConfigureAccount configures the account identified by the account email; if no such account exists, an error is returned.
+func (mngr *AccountsManager) ConfigureAccount(accountData *data.Account) error {
+ mngr.mutex.Lock()
+ defer mngr.mutex.Unlock()
+
+ account, err := mngr.findAccount(FindByEmail, accountData.Email)
+ if err != nil {
+ return errors.Wrap(err, "user to configure not found")
+ }
+
+ if err := account.Configure(accountData); err == nil {
+ account.DateModified = time.Now()
+
+ mngr.storage.AccountUpdated(account)
+ mngr.writeAllAccounts()
+
+ mngr.callListeners(account, AccountsListener.AccountUpdated)
+ } else {
+ return errors.Wrap(err, "error while configuring account")
+ }
+
+ return nil
+}
+
// ResetPassword resets the password for the given user.
func (mngr *AccountsManager) ResetPassword(name string) error {
account, err := mngr.findAccount(FindByEmail, name)
@@ -345,7 +370,7 @@ func (mngr *AccountsManager) UnregisterAccountSite(accountData *data.Account) er
return errors.Wrap(err, "unable to get site ID")
}
- if err := sitereg.UnregisterSite(mngr.conf.SiteRegistration.URL, account.Data.APIKey, siteID, salt); err != nil {
+ if err := sitereg.UnregisterSite(path.Join(mngr.conf.Mentix.URL, mngr.conf.Mentix.SiteRegistrationEndpoint), account.Data.APIKey, siteID, salt); err != nil {
return errors.Wrap(err, "error while unregistering the site")
}
diff --git a/pkg/siteacc/siteacc.go b/pkg/siteacc/siteacc.go
index e42e3ef12d..a819863e25 100644
--- a/pkg/siteacc/siteacc.go
+++ b/pkg/siteacc/siteacc.go
@@ -24,6 +24,7 @@ import (
accpanel "github.com/cs3org/reva/pkg/siteacc/account"
"github.com/cs3org/reva/pkg/siteacc/admin"
+ "github.com/cs3org/reva/pkg/siteacc/alerting"
"github.com/cs3org/reva/pkg/siteacc/config"
"github.com/cs3org/reva/pkg/siteacc/html"
"github.com/cs3org/reva/pkg/siteacc/manager"
@@ -41,6 +42,8 @@ type SiteAccounts struct {
accountsManager *manager.AccountsManager
usersManager *manager.UsersManager
+ alertsDispatcher *alerting.Dispatcher
+
adminPanel *admin.Panel
accountPanel *accpanel.Panel
}
@@ -77,6 +80,13 @@ func (siteacc *SiteAccounts) initialize(conf *config.Configuration, log *zerolog
}
siteacc.usersManager = umngr
+ // Create the alerts dispatcher instance
+ dispatcher, err := alerting.NewDispatcher(conf, log)
+ if err != nil {
+ return errors.Wrap(err, "error creating the alerts dispatcher")
+ }
+ siteacc.alertsDispatcher = dispatcher
+
// Create the admin panel
if pnl, err := admin.NewPanel(conf, log); err == nil {
siteacc.adminPanel = pnl
@@ -144,6 +154,11 @@ func (siteacc *SiteAccounts) UsersManager() *manager.UsersManager {
return siteacc.usersManager
}
+// AlertsDispatcher returns the central alerts dispatcher instance.
+func (siteacc *SiteAccounts) AlertsDispatcher() *alerting.Dispatcher {
+ return siteacc.alertsDispatcher
+}
+
// GetPublicEndpoints returns a list of all public endpoints.
func (siteacc *SiteAccounts) GetPublicEndpoints() []string {
// TODO: Only for local testing!
@@ -163,7 +178,7 @@ func New(conf *config.Configuration, log *zerolog.Logger) (*SiteAccounts, error)
// Configure the accounts service
siteacc := new(SiteAccounts)
if err := siteacc.initialize(conf, log); err != nil {
- return nil, fmt.Errorf("unable to initialize SiteAccounts: %v", err)
+ return nil, fmt.Errorf("unable to initialize site accounts: %v", err)
}
return siteacc, nil
}