github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

feat(api): add support for an externally fetched title for motd (#2755) 

* feat(api): add support for an externally fetched title for motd

* refactor(api): gofmt motd.go

* refactor(api): update go comment
pull/2760/head
Anthony Lapenna 2019-03-05 16:05:15 +13:00 committed by GitHub
parent e2a17480af
commit 2b31f489d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/http/handler/motd/motd.go
View File

@ -10,6 +10,7 @@ import (
) )
type motdResponse struct { type motdResponse struct {
Title string `json:"Title"`
Message string `json:"Message"` Message string `json:"Message"`
Hash []byte `json:"Hash"` Hash []byte `json:"Hash"`
} }
@ -22,6 +23,12 @@ func (handler *Handler) motd(w http.ResponseWriter, r *http.Request) {
return return
} }
title, err := client.Get(portainer.MessageOfTheDayTitleURL, 0)
if err != nil {
response.JSON(w, &motdResponse{Message: ""})
return
}
hash := crypto.HashFromBytes(motd) hash := crypto.HashFromBytes(motd)
response.JSON(w, &motdResponse{Message: string(motd), Hash: hash}) response.JSON(w, &motdResponse{Title: string(title), Message: string(motd), Hash: hash})
} }

2
api/portainer.go
View File

@ -801,6 +801,8 @@ const (
AssetsServerURL = "https://portainer-io-assets.sfo2.digitaloceanspaces.com" AssetsServerURL = "https://portainer-io-assets.sfo2.digitaloceanspaces.com"
// MessageOfTheDayURL represents the URL where Portainer MOTD message can be retrieved // MessageOfTheDayURL represents the URL where Portainer MOTD message can be retrieved
MessageOfTheDayURL = AssetsServerURL + "/motd.html" MessageOfTheDayURL = AssetsServerURL + "/motd.html"
// MessageOfTheDayTitleURL represents the URL where Portainer MOTD title can be retrieved
MessageOfTheDayTitleURL = AssetsServerURL + "/motd-title.txt"
// ExtensionDefinitionsURL represents the URL where Portainer extension definitions can be retrieved // ExtensionDefinitionsURL represents the URL where Portainer extension definitions can be retrieved
ExtensionDefinitionsURL = AssetsServerURL + "/extensions-1.20.2.json" ExtensionDefinitionsURL = AssetsServerURL + "/extensions-1.20.2.json"
// PortainerAgentHeader represents the name of the header available in any agent response // PortainerAgentHeader represents the name of the header available in any agent response

1
app/portainer/models/motd.js
View File

@ -1,4 +1,5 @@
function MotdViewModel(data) { function MotdViewModel(data) {
this.Title = data.Title;
this.Message = data.Message; this.Message = data.Message;
this.Hash = data.Hash; this.Hash = data.Hash;
} }

2
app/portainer/views/home/home.html
View File

@ -9,7 +9,7 @@
<information-panel <information-panel
ng-if="motd && motd.Message !== '' && applicationState.UI.dismissedInfoHash !== motd.Hash" ng-if="motd && motd.Message !== '' && applicationState.UI.dismissedInfoHash !== motd.Hash"
title-text="Important message" title-text="{{ motd.Title }}"
dismiss-action="dismissImportantInformation(motd.Hash)"> dismiss-action="dismissImportantInformation(motd.Hash)">
<span class="text-muted"> <span class="text-muted">
<p ng-bind-html="motd.Message"></p> <p ng-bind-html="motd.Message"></p>