Use patched Alps from git.deuxfleurs.fr/Deuxfleurs/alps

This commit is contained in:
Alex 2021-03-08 17:32:05 +01:00
parent b42e42faaa
commit a84f4c8f87
4 changed files with 11 additions and 64 deletions

View file

@ -38,7 +38,7 @@ services:
build: build:
context: ./email/build/alps context: ./email/build/alps
args: args:
VERSION: 5cef0aaff2b8b6ee3e00b566123517e241d8cfb8 VERSION: 9bafa64b9d
image: superboum/amd64_alps:v1 image: superboum/amd64_alps:v1
# VoIP # VoIP

View file

@ -6,14 +6,11 @@ ENV CGO_ENABLED=0 GOOS=linux GOARCH=amd64
WORKDIR /tmp/alps WORKDIR /tmp/alps
RUN git init && \ RUN git init && \
git remote add origin https://git.sr.ht/~migadu/alps && \ git remote add origin https://git.deuxfleurs.fr/Deuxfleurs/alps.git && \
git fetch --depth 1 origin ${VERSION} && \ git fetch --depth 1 origin ${VERSION} && \
git checkout FETCH_HEAD git checkout FETCH_HEAD
COPY skipverify.patch skipverify.patch RUN go build -a -o /usr/local/bin/alps ./cmd/alps
RUN git apply skipverify.patch && \
go build -a -o /usr/local/bin/alps ./cmd/alps
FROM scratch FROM scratch
COPY --from=builder /usr/local/bin/alps /alps COPY --from=builder /usr/local/bin/alps /alps

View file

@ -1,55 +0,0 @@
From 47765c10f1af2013556f76dc63dfa056167ae5e8 Mon Sep 17 00:00:00 2001
From: Quentin <quentin@deuxfleurs.fr>
Date: Fri, 4 Dec 2020 13:19:24 +0100
Subject: [PATCH] Skip CA verification
---
imap.go | 3 ++-
smtp.go | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/imap.go b/imap.go
index 7554331..1a4931d 100644
--- a/imap.go
+++ b/imap.go
@@ -3,6 +3,7 @@ package alps
import (
"fmt"
+ "crypto/tls"
"github.com/emersion/go-imap"
imapclient "github.com/emersion/go-imap/client"
"github.com/emersion/go-message/charset"
@@ -16,7 +17,7 @@ func (s *Server) dialIMAP() (*imapclient.Client, error) {
var c *imapclient.Client
var err error
if s.imap.tls {
- c, err = imapclient.DialTLS(s.imap.host, nil)
+ c, err = imapclient.DialTLS(s.imap.host, &tls.Config{InsecureSkipVerify: true})
if err != nil {
return nil, fmt.Errorf("failed to connect to IMAPS server: %v", err)
}
diff --git a/smtp.go b/smtp.go
index 5e178f2..8d22f1d 100644
--- a/smtp.go
+++ b/smtp.go
@@ -3,6 +3,7 @@ package alps
import (
"fmt"
+ "crypto/tls"
"github.com/emersion/go-smtp"
)
@@ -14,7 +15,7 @@ func (s *Server) dialSMTP() (*smtp.Client, error) {
var c *smtp.Client
var err error
if s.smtp.tls {
- c, err = smtp.DialTLS(s.smtp.host, nil)
+ c, err = smtp.DialTLS(s.smtp.host, &tls.Config{InsecureSkipVerify: true})
if err != nil {
return nil, fmt.Errorf("failed to connect to SMTPS server: %v", err)
}
--
2.28.0

View file

@ -393,11 +393,16 @@ job "email" {
task "main" { task "main" {
driver = "docker" driver = "docker"
config { config {
image = "superboum/amd64_alps:v1" image = "lxpz/alps_amd64:v2"
readonly_rootfs = true readonly_rootfs = true
ports = [ "alps_web_port" ] ports = [ "alps_web_port" ]
command = "-theme" args = [
args = [ "alps", "imaps://imap.deuxfleurs.fr:993", "smtps://smtp.deuxfleurs.fr:465" ] "-skiptlsverification",
"-theme",
"alps",
"imaps://imap.deuxfleurs.fr:993",
"smtps://smtp.deuxfleurs.fr:465"
]
} }
resources { resources {