lilfade/Activity-Relay
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Update build step.

Browse Source
This commit is contained in:
Naoki Kosaka 2019-06-02 21:08:40 +09:00
parent 99c2525419
commit 6ca6c9aad0
7 changed files with 78 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@ -5,9 +5,9 @@ COPY . /Activity-Relay
RUN mkdir -p /rootfs/usr/bin && \ RUN mkdir -p /rootfs/usr/bin && \
apk add -U --no-cache git && \ apk add -U --no-cache git && \
go build -o /rootfs/usr/bin/server . && \ go build -o /rootfs/usr/bin/server -ldflags "-X main.version=$(git describe --tags HEAD)" . && \
go build -o /rootfs/usr/bin/worker ./worker && \ go build -o /rootfs/usr/bin/worker -ldflags "-X main.version=$(git describe --tags HEAD)" ./worker && \
go build -o /rootfs/usr/bin/ar-cli ./cli go build -o /rootfs/usr/bin/ar-cli -ldflags "-X main.version=$(git describe --tags HEAD)" ./cli
FROM alpine FROM alpine

45
cli/cli.go
View File

@ -15,13 +15,17 @@ import (
state "github.com/yukimochi/Activity-Relay/State" state "github.com/yukimochi/Activity-Relay/State"
) )
// Actor : Relay's Actor var (
var Actor activitypub.Actor version string
var hostname *url.URL // Actor : Relay's Actor
var hostkey *rsa.PrivateKey Actor activitypub.Actor
var macServer *machinery.Server
var relayState state.RelayState hostname *url.URL
hostkey *rsa.PrivateKey
relayState state.RelayState
machineryServer *machinery.Server
)
func initConfig() { func initConfig() {
viper.SetConfigName("config") viper.SetConfigName("config")
@ -30,41 +34,42 @@ func initConfig() {
if err != nil { if err != nil {
fmt.Println("Config file is not exists. Use environment variables.") fmt.Println("Config file is not exists. Use environment variables.")
viper.BindEnv("actor_pem") viper.BindEnv("actor_pem")
viper.BindEnv("relay_domain")
viper.BindEnv("relay_bind")
viper.BindEnv("relay_servicename")
viper.BindEnv("redis_url") viper.BindEnv("redis_url")
viper.BindEnv("relay_bind")
viper.BindEnv("relay_domain")
viper.BindEnv("relay_servicename")
} else { } else {
Actor.Summary = viper.GetString("relay_summary") Actor.Summary = viper.GetString("relay_summary")
Actor.Icon = activitypub.Image{viper.GetString("relay_icon")} Actor.Icon = activitypub.Image{URL: viper.GetString("relay_icon")}
Actor.Image = activitypub.Image{viper.GetString("relay_image")} Actor.Image = activitypub.Image{URL: viper.GetString("relay_image")}
} }
Actor.Name = viper.GetString("relay_servicename") Actor.Name = viper.GetString("relay_servicename")
hostkey, err := keyloader.ReadPrivateKeyRSAfromPath(viper.GetString("actor_pem"))
if err != nil {
panic(err)
}
hostname, err = url.Parse("https://" + viper.GetString("relay_domain")) hostname, err = url.Parse("https://" + viper.GetString("relay_domain"))
if err != nil { if err != nil {
panic(err) panic(err)
} }
redOption, err := redis.ParseURL(viper.GetString("redis_url")) hostkey, err := keyloader.ReadPrivateKeyRSAfromPath(viper.GetString("actor_pem"))
if err != nil { if err != nil {
panic(err) panic(err)
} }
redClient := redis.NewClient(redOption) redisOption, err := redis.ParseURL(viper.GetString("redis_url"))
var macConfig = &config.Config{ if err != nil {
panic(err)
}
redisClient := redis.NewClient(redisOption)
relayState = state.NewState(redisClient)
var machineryConfig = &config.Config{
Broker: viper.GetString("redis_url"), Broker: viper.GetString("redis_url"),
DefaultQueue: "relay", DefaultQueue: "relay",
ResultBackend: viper.GetString("redis_url"), ResultBackend: viper.GetString("redis_url"),
ResultsExpireIn: 5, ResultsExpireIn: 5,
} }
macServer, err = machinery.NewServer(macConfig) machineryServer, err = machinery.NewServer(machineryConfig)
if err != nil { if err != nil {
panic(err) panic(err)
} }
relayState = state.NewState(redClient)
Actor.GenerateSelfKey(hostname, &hostkey.PublicKey) Actor.GenerateSelfKey(hostname, &hostkey.PublicKey)
} }

2
cli/follow.go
View File

@ -74,7 +74,7 @@ func pushRegistorJob(inboxURL string, body []byte) {
}, },
}, },
} }
_, err := macServer.SendTask(job) _, err := machineryServer.SendTask(job)
if err != nil { if err != nil {
fmt.Fprintln(os.Stderr, err) fmt.Fprintln(os.Stderr, err)
} }

8
decode.go
View File

@ -5,11 +5,13 @@ import (
"encoding/base64" "encoding/base64"
"encoding/json" "encoding/json"
"errors" "errors"
"fmt"
"net/http" "net/http"
"strconv" "strconv"
"github.com/yukimochi/Activity-Relay/ActivityPub" "github.com/spf13/viper"
"github.com/yukimochi/Activity-Relay/KeyLoader" activitypub "github.com/yukimochi/Activity-Relay/ActivityPub"
keyloader "github.com/yukimochi/Activity-Relay/KeyLoader"
"github.com/yukimochi/httpsig" "github.com/yukimochi/httpsig"
) )
@ -26,7 +28,7 @@ func decodeActivity(request *http.Request) (*activitypub.Activity, *activitypub.
} }
KeyID := verifier.KeyId() KeyID := verifier.KeyId()
remoteActor := new(activitypub.Actor) remoteActor := new(activitypub.Actor)
err = remoteActor.RetrieveRemoteActor(KeyID, uaString, actorCache) err = remoteActor.RetrieveRemoteActor(KeyID, fmt.Sprintf("%s (golang net/http; Activity-Relay %s; %s)", viper.GetString("relay_servicename"), version, hostURL.Host), actorCache)
if err != nil { if err != nil {
return nil, nil, nil, err return nil, nil, nil, err
} }

42
main.go
View File

@ -17,18 +17,21 @@ import (
state "github.com/yukimochi/Activity-Relay/State" state "github.com/yukimochi/Activity-Relay/State"
) )
// Actor : Relay's Actor var (
var Actor activitypub.Actor version string
// WebfingerResource : Relay's Webfinger resource // Actor : Relay's Actor
var WebfingerResource activitypub.WebfingerResource Actor activitypub.Actor
var hostURL *url.URL // WebfingerResource : Relay's Webfinger resource
var hostPrivatekey *rsa.PrivateKey WebfingerResource activitypub.WebfingerResource
var actorCache *cache.Cache
var machineryServer *machinery.Server hostURL *url.URL
var relayState state.RelayState hostPrivatekey *rsa.PrivateKey
var uaString string relayState state.RelayState
machineryServer *machinery.Server
actorCache *cache.Cache
)
func initConfig() { func initConfig() {
viper.SetConfigName("config") viper.SetConfigName("config")
@ -37,14 +40,14 @@ func initConfig() {
if err != nil { if err != nil {
fmt.Println("Config file is not exists. Use environment variables.") fmt.Println("Config file is not exists. Use environment variables.")
viper.BindEnv("actor_pem") viper.BindEnv("actor_pem")
viper.BindEnv("relay_domain")
viper.BindEnv("relay_bind")
viper.BindEnv("relay_servicename")
viper.BindEnv("redis_url") viper.BindEnv("redis_url")
viper.BindEnv("relay_bind")
viper.BindEnv("relay_domain")
viper.BindEnv("relay_servicename")
} else { } else {
Actor.Summary = viper.GetString("relay_summary") Actor.Summary = viper.GetString("relay_summary")
Actor.Icon = activitypub.Image{viper.GetString("relay_icon")} Actor.Icon = activitypub.Image{URL: viper.GetString("relay_icon")}
Actor.Image = activitypub.Image{viper.GetString("relay_image")} Actor.Image = activitypub.Image{URL: viper.GetString("relay_image")}
} }
Actor.Name = viper.GetString("relay_servicename") Actor.Name = viper.GetString("relay_servicename")
@ -55,6 +58,7 @@ func initConfig() {
panic(err) panic(err)
} }
redisClient := redis.NewClient(redisOption) redisClient := redis.NewClient(redisOption)
relayState = state.NewState(redisClient)
machineryConfig := &config.Config{ machineryConfig := &config.Config{
Broker: viper.GetString("redis_url"), Broker: viper.GetString("redis_url"),
DefaultQueue: "relay", DefaultQueue: "relay",
@ -65,13 +69,13 @@ func initConfig() {
if err != nil { if err != nil {
panic(err) panic(err)
} }
uaString = viper.GetString("relay_servicename") + " (golang net/http; Activity-Relay v0.2.3; " + hostURL.Host + ")"
relayState = state.NewState(redisClient)
actorCache = cache.New(5*time.Minute, 10*time.Minute)
Actor.GenerateSelfKey(hostURL, &hostPrivatekey.PublicKey) Actor.GenerateSelfKey(hostURL, &hostPrivatekey.PublicKey)
actorCache = cache.New(5*time.Minute, 10*time.Minute)
WebfingerResource.GenerateFromActor(hostURL, &Actor) WebfingerResource.GenerateFromActor(hostURL, &Actor)
fmt.Println("Welcome to YUKIMOCHI Activity-Relay [Server]\n - Configrations") fmt.Println("Welcome to YUKIMOCHI Activity-Relay [Server]", version)
fmt.Println(" - Configrations")
fmt.Println("RELAY DOMAIN : ", hostURL.Host) fmt.Println("RELAY DOMAIN : ", hostURL.Host)
fmt.Println("REDIS URL : ", viper.GetString("redis_url")) fmt.Println("REDIS URL : ", viper.GetString("redis_url"))
fmt.Println("BIND ADDRESS : ", viper.GetString("relay_bind")) fmt.Println("BIND ADDRESS : ", viper.GetString("relay_bind"))

3
worker/sender.go
View File

@ -11,6 +11,7 @@ import (
"time" "time"
httpdate "github.com/Songmu/go-httpdate" httpdate "github.com/Songmu/go-httpdate"
"github.com/spf13/viper"
"github.com/yukimochi/httpsig" "github.com/yukimochi/httpsig"
) )
@ -35,7 +36,7 @@ func appendSignature(request *http.Request, body *[]byte, KeyID string, publicKe
func sendActivity(inboxURL string, KeyID string, body []byte, publicKey *rsa.PrivateKey) error { func sendActivity(inboxURL string, KeyID string, body []byte, publicKey *rsa.PrivateKey) error {
req, _ := http.NewRequest("POST", inboxURL, bytes.NewBuffer(body)) req, _ := http.NewRequest("POST", inboxURL, bytes.NewBuffer(body))
req.Header.Set("Content-Type", "application/activity+json") req.Header.Set("Content-Type", "application/activity+json")
req.Header.Set("User-Agent", uaString) req.Header.Set("User-Agent", fmt.Sprintf("%s (golang net/http; Activity-Relay %s; %s)", viper.GetString("relay_servicename"), version, hostURL.Host))
req.Header.Set("Date", httpdate.Time2Str(time.Now())) req.Header.Set("Date", httpdate.Time2Str(time.Now()))
appendSignature(req, &body, KeyID, publicKey) appendSignature(req, &body, KeyID, publicKey)
client := &http.Client{Timeout: time.Duration(5) * time.Second} client := &http.Client{Timeout: time.Duration(5) * time.Second}

34
worker/worker.go
View File

@ -17,14 +17,17 @@ import (
keyloader "github.com/yukimochi/Activity-Relay/KeyLoader" keyloader "github.com/yukimochi/Activity-Relay/KeyLoader"
) )
// Actor : Relay's Actor var (
var Actor activitypub.Actor version string
var hostURL *url.URL // Actor : Relay's Actor
var hostPrivatekey *rsa.PrivateKey Actor activitypub.Actor
var machineryServer *machinery.Server
var redisClient *redis.Client hostURL *url.URL
var uaString string hostPrivatekey *rsa.PrivateKey
redisClient *redis.Client
machineryServer *machinery.Server
)
func relayActivity(args ...string) error { func relayActivity(args ...string) error {
inboxURL := args[0] inboxURL := args[0]
@ -54,14 +57,14 @@ func initConfig() {
if err != nil { if err != nil {
fmt.Println("Config file is not exists. Use environment variables.") fmt.Println("Config file is not exists. Use environment variables.")
viper.BindEnv("actor_pem") viper.BindEnv("actor_pem")
viper.BindEnv("relay_domain")
viper.BindEnv("relay_bind")
viper.BindEnv("relay_servicename")
viper.BindEnv("redis_url") viper.BindEnv("redis_url")
viper.BindEnv("relay_bind")
viper.BindEnv("relay_domain")
viper.BindEnv("relay_servicename")
} else { } else {
Actor.Summary = viper.GetString("relay_summary") Actor.Summary = viper.GetString("relay_summary")
Actor.Icon = activitypub.Image{viper.GetString("relay_icon")} Actor.Icon = activitypub.Image{URL: viper.GetString("relay_icon")}
Actor.Image = activitypub.Image{viper.GetString("relay_image")} Actor.Image = activitypub.Image{URL: viper.GetString("relay_image")}
} }
Actor.Name = viper.GetString("relay_servicename") Actor.Name = viper.GetString("relay_servicename")
@ -82,12 +85,13 @@ func initConfig() {
if err != nil { if err != nil {
panic(err) panic(err)
} }
Actor.GenerateSelfKey(hostURL, &hostPrivatekey.PublicKey)
newNullLogger := NewNullLogger() newNullLogger := NewNullLogger()
log.DEBUG = newNullLogger log.DEBUG = newNullLogger
uaString = viper.GetString("relay_servicename") + " (golang net/http; Activity-Relay v0.2.3; " + hostURL.Host + ")"
Actor.GenerateSelfKey(hostURL, &hostPrivatekey.PublicKey)
fmt.Println("Welcome to YUKIMOCHI Activity-Relay [Worker]\n - Configrations") fmt.Println("Welcome to YUKIMOCHI Activity-Relay [Worker]", version)
fmt.Println(" - Configrations")
fmt.Println("RELAY DOMAIN : ", hostURL.Host) fmt.Println("RELAY DOMAIN : ", hostURL.Host)
fmt.Println("REDIS URL : ", viper.GetString("redis_url")) fmt.Println("REDIS URL : ", viper.GetString("redis_url"))
} }