goversion main framework working, need to sort templates etc

src/default-config/config.default.toml

@@ -1,13 +0,0 @@
-# Sample config.ini file.
-# Copy this file to "config/config.ini" and adjust the settings to your requirements
-
-# The URL of this application
-BaseURL = "https://autoconfig.example.com"
-
-# Set the email domains for use with this service. The first one is primary.
-# each will need their own DNS A record for autoconfig.domain.name
-Domains = ["example.com","example2,com"]
-
-
-# If you use a different domain to authenticate with, enter it here
-LogonDomain = "example.local"

src/default-config/config.default.yaml

@@ -0,0 +1,17 @@
+---
+Version : "0.1.1"
+# Sample config.yaml file.
+# Copy this file to "config/config.yaml" and adjust the
+# settings to your requirements
+
+# The URL of this application
+BaseURL : "https://autoconfig.example.com"
+
+# Set the email domains for use with this service. The first one is primary.
+# each will need their own DNS A record for autoconfig.domain.name
+Domains :
+  - "example.com"
+  - "example2,com"
+
+# If you use a different domain to authenticate with, enter it here
+LogonDomain : "example.local"

src/default-config/services.default.toml

@@ -1,121 +0,0 @@
-# The Incoming mail Server Config
-
-[InMail]
-  # Enable this service
-Enabled = true
-
-  # Mail Type, i.e. IMAP, POP3
-  Type = "IMAP"
-
-  # Your IMAP server
-  Server = "imap.example.com"
-
-  # Your IMAP port
-  Port = 993
-
-  # The socket type = SSL, STARTTLS, or NONE
-  SocketType = "SSL"
-
-  # Use Secure Password Authentication
-  SPA = false
-
-  # Change to true if you need the domain/logondomain to form part of the username
-  UsernameIsFQDN = false
-
-  # Do you need to authenticate to your mail server? You should! so this should be false!
-  NoAuthRequired = false
-
-  # Authentication type,
-  #"password-cleartext" = Send password in the clear
-  #                       (dangerous, if SSL isn't used either).
-  #                       AUTH PLAIN, LOGIN or protocol-native login.
-  #"password-encrypted" = A secure encrypted password mechanism.
-  #                       Can be CRAM-MD5 or DIGEST-MD5. Not NTLM.
-  #"NTLM"=                Use NTLM (or NTLMv2 or successors),
-  #                       the Windows login mechanism.
-  Authentication = "password-cleartext"
-
-#
-#
-# # The Outgoing mail server config
-# [OutMail]
-#   Name = "OutMail"
-#
-#   # Enable this service
-#   Enabled = true
-#
-#   # Mail type, likely to only be SMTP
-#   Type = "SMTP"
-#
-#   # Your SMTP server
-#   Server = "smtp.example.com"
-#
-#   # Your SMTP port
-#   Port = 465
-#
-#   # The socket type = SSL, STARTTLS or NONE
-#   SocketType = "SSL"
-#
-#   # See InMail > Authentication
-#   Authentication = "password-cleartext"
-#
-#   # Use Secure Password Authentication
-#   SPA = false
-#
-#   # Change to true if you need the domain/logondomain to form part of the username
-#   UsernameIsFQDN = false
-#
-#   # Do you need to authenticate to your mail server? You should! so this should be false!
-#   NoAuthRequired = false
-#
-#   # Use POP Authentication? You probably shouldn't be.
-#   POPAuth = false
-#
-#   # This setting is here to limit errors, I'm not sure what it does yet.
-#   SMTPLast = false
-#
-#
-# # Currently not implemented, see https://wiki.mozilla.org/Thunderbird=Autoconfiguration=ConfigFileFormat
-# [Calendar]
-#   Name = "Calendar"
-#   # Disable this service
-#   Enabled = false
-#   Server = "https://example.com/remote.php/dav/"
-#   Port = 443
-#   Type = "CalDAV"
-#   Authentication = "http-basic"
-#   UsernameIsFQDN = false
-#
-# # Currently not implemented, see https://wiki.mozilla.org/Thunderbird=Autoconfiguration=ConfigFileFormat
-# [AddressBook]
-#   Name = "AddressBook"
-#   # Disable this service
-#   Enabled = false
-#   Server = "https://example.com/remote.php/dav/"
-#   Port = 443
-#   Type = "CardDAV"
-#   Authentication = "http-basic"
-#   UsernameIsFQDN = false
-#
-# # Currently not implemented, see https://wiki.mozilla.org/Thunderbird=Autoconfiguration=ConfigFileFormat
-# [WebMail]
-#   Name = "WebMail"
-#   # Disable this service
-#   Enabled = false
-#   Server = "https://mail.example.com"
-#   UsernameDivID = "username"
-#   UsernameDivName = "username"
-#   PasswordDivName = "password"
-#   SubmitButtonID = "submit"
-#   SubmitButtonName = "submit"
-#   UsernameIsFQDN = false
-#
-#
-# # In theory, additional custom services can be configured and will be displayed with
-# # their options on the /get/all URL of this service. The third-party clients would need to
-# # check this service as part of their development for this to work
-# # Will not be shown in autodiscover.xml/json or config-v1.1.xml/autoconfig.xml
-# # i.e Nextcloud - ideally a nextcloud client could check autoconfig for this URL for ease of set up
-# #[Nextcloud]
-# #  Name = "NextCloud"
-# # Server = "https://nextcloud.example.com"

src/default-config/services.default.yaml

@@ -0,0 +1,124 @@
+# Sample services.yaml file.
+# Copy this file to "config/services.yaml" and adjust the
+# settings to your requirements
+---
+
+# The Incoming mail Server Config
+InMail:
+  Name: "InMail"
+
+  # Enable this service
+  Enabled: true
+
+  # Mail Type, i.e. IMAP, POP3
+  Type: "IMAP"
+
+  # Your IMAP server
+  Server: "imap.example.com"
+
+  # Your IMAP port
+  Port: 993
+
+  # The socket type : SSL, STARTTLS, or NONE
+  SocketType: "SSL"
+
+  # Use Secure Password Authentication
+  SPA: false
+
+  # Change to true if you need the domain/logondomain to form part of the username
+  UsernameIsFQDN: false
+
+  # Do you need to authenticate to your mail server? You should! so this should be false!
+  NoAuthRequired: false
+
+  # Authentication type,
+  #"password-cleartext" : Send password in the clear
+  #                       (dangerous, if SSL isn't used either).
+  #                       AUTH PLAIN, LOGIN or protocol-native login.
+  #"password-encrypted" : A secure encrypted password mechanism.
+  #                       Can be CRAM-MD5 or DIGEST-MD5. Not NTLM.
+  #"NTLM":                Use NTLM (or NTLMv2 or successors),
+  #                       the Windows login mechanism.
+  Authentication: "password-cleartext"
+
+# The Outgoing mail server config
+OutMail:
+  # Enable this service
+  Enabled: true
+
+  # Mail type, likely to only be SMTP
+  Type: "SMTP"
+
+  # Your SMTP server
+  Server: "smtp.example.com"
+
+  # Your SMTP port
+  Port: 465
+
+  # The socket type : SSL, STARTTLS or NONE
+  SocketType: "SSL"
+
+  # See InMail > Authentication
+  Authentication: "password-cleartext"
+
+  # Use Secure Password Authentication
+  SPA: false
+
+  # Change to true if you need the domain/logondomain to form part of the username
+  UsernameIsFQDN: false
+
+  # Do you need to authenticate to your mail server? You should! so this should be false!
+  NoAuthRequired: false
+
+  # Use POP Authentication? You probably shouldn't be.
+  POPAuth: false
+
+  # This setting is here to limit errors, I'm not sure what it does yet.
+  SMTPLast: false
+
+
+# Currently not implemented, see https://wiki.mozilla.org/Thunderbird:Autoconfiguration:ConfigFileFormat
+Calendar:
+  Name: "Calendar"
+  # Disable this service
+  Enabled: false
+  Server: "https://example.com/remote.php/dav/"
+  Port: 443
+  Type: "CalDAV"
+  Authentication: "http-basic"
+  UsernameIsFQDN: false
+
+# Currently not implemented, see https://wiki.mozilla.org/Thunderbird:Autoconfiguration:ConfigFileFormat
+AddressBook:
+  Name: "AddressBook"
+  # Disable this service
+  Enabled: false
+  Server: "https://example.com/remote.php/dav/"
+  Port: 443
+  Type: "CardDAV"
+  Authentication: "http-basic"
+  UsernameIsFQDN: false
+
+# Currently not implemented, see https://wiki.mozilla.org/Thunderbird:Autoconfiguration:ConfigFileFormat
+WebMail:
+  Name: "WebMail"
+  # Disable this service
+  Enabled: false
+  Server: "https://mail.example.com"
+  UsernameDivID: "username"
+  UsernameDivName: "username"
+  PasswordDivName: "password"
+  SubmitButtonID: "submit"
+  SubmitButtonName: "submit"
+  UsernameIsFQDN: false
+
+
+# In theory, additional custom services can be configured and will be displayed with
+# their options on the /get/all URL of this service. The third-party clients would need to
+# check this service as part of their development for this to work
+# Will not be shown in autodiscover.xml/json or config-v1.1.xml/autoconfig.xml
+# i.e Nextcloud - ideally a nextcloud client could check autoconfig for this URL for ease of set up
+#OtherServices:
+#  -
+#    Name : "NextCloud"
+#    Server : "https://nextcloud.example.com"

src/global/global.go

@@ -2,9 +2,10 @@ package global
 import (
   . "mailautoconf/structs"
   "fmt"
-  "github.com/pelletier/go-toml/v2"
+  "gopkg.in/yaml.v2"
   "io/ioutil"
   "os"
+  "encoding/json"
 
 )
 
@@ -20,75 +21,36 @@ func NewConfig() Config {
 }
 func loadConfig() Config {
   cfg := Config{}
-
   fmt.Println("Loading Default Config…")
-  cfgfile := defaultConfigDir + "config.default.toml"
+  cfgfile := defaultConfigDir + "config.default.yaml"
   unmarshalConfig(cfgfile, &cfg)
-  fmt.Println(cfg)
+  fmt.Println("Loading Custom Config…")
-  customcfgfile := configDir + "config.toml"
+  customcfgfile := configDir + "config.yaml"
   unmarshalConfig(customcfgfile, &cfg)
-  fmt.Println(cfg)
+  fmt.Println("Loading Default Services…")
-  svcfile := defaultConfigDir + "services.default.toml"
+  svcfile := defaultConfigDir + "services.default.yaml"
-  // cfg.Services = []Service{
+  unmarshalConfig(svcfile, &cfg)
-  //   Service{
+  fmt.Println("Loading Custom Services…")
-  //     Name : "first",
+  customsvcfile := configDir + "services.yaml"
-  //   },
+  unmarshalConfig(customsvcfile, &cfg)
-  //   Service{
-  //     Name : "second",
-  //   },
-  //   Service{
-  //     Name : "third",
-  //   },
-  // }
-  // data, _ := toml.Marshal(cfg)
-
-  // ioutil.WriteFile(svcfile, data, 0)
-
-  unmarshalServices(svcfile, &cfg)
-
-  customsvcfile := configDir + "services.toml"
-  unmarshalServices(customsvcfile, &cfg)
-  // fmt.Println(cfg)
-  fmt.Println("\r\nOur Config :")
-  fmt.Println(cfg)
   return cfg
 }
 
 func unmarshalConfig(file string, cfg *Config)  {
-  if fileExists(file) {
+  if FileExists(file) {
     content, err := ioutil.ReadFile(file)
     if err != nil {
       fmt.Println("Error reading config :", file, " : ", err)
     }
-    err2 := toml.Unmarshal(content, &cfg)
+    err2 := yaml.Unmarshal(content, &cfg)
     if err2 != nil {
       fmt.Println("Error unmarshalling config :", file, " : ", err2)
     }
   }
 }
 
-func unmarshalServices(file string, cfg *Config)  {
-  if fileExists(file) {
-    content, err := ioutil.ReadFile(file)
-    if err != nil {
-      fmt.Println("Error reading services :", file, " : ", err)
-    }
-    customsvcfile := configDir + "services.toml"
-    content2, err2 := ioutil.ReadFile(file)
-    if err2 != nil {
-      fmt.Println("Error reading services :", customsvcfile, " : ", err2)
-    }
-    content = []byte(fmt.Sprintf(string(content),string(content2)))
-    var x map[string]interface{}
-    err3 := toml.Unmarshal(content, &x)
-    if err3 != nil {
-      fmt.Println("Error unmarshalling services :", file, " : ", err3)
-    }
-    fmt.Println(x)
-  }
-}
 
-func fileExists(file string) bool {
+func FileExists(file string) bool {
   exists := false
   if _, err := os.Stat(file); err == nil {
     exists = true
@@ -98,3 +60,11 @@ func fileExists(file string) bool {
   }
   return exists
 }
+
+func JSONify(content interface{}) string {
+  data, err := json.Marshal(content)
+  if err != nil {
+    fmt.Println(err)
+  }
+  return string(data)
+}

src/go.mod

@@ -3,6 +3,5 @@ module mailautoconf
 go 1.16
 
 require (
-	github.com/pelletier/go-toml v1.9.3 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.0-beta.3 // indirect
 )

src/go.sum

@@ -1,10 +1,3 @@
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/pelletier/go-toml v1.9.3 h1:zeC5b1GviRUyKYd6OJPvBU/mcVDVoL1OhT17FCt5dSQ=
-github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
-github.com/pelletier/go-toml/v2 v2.0.0-beta.3 h1:PNCTU4naEJ8mKal97P3A2qDU74QRQGlv4FXiL1XDqi4=
-github.com/pelletier/go-toml/v2 v2.0.0-beta.3/go.mod h1:aNseLYu/uKskg0zpr/kbr2z8yGuWtotWf/0BpGIAL2Y=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.7.1-0.20210427113832-6241f9ab9942/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=

src/structs/structs.go

@@ -8,31 +8,53 @@ type Session struct {
   Request *http.Request
   Path string
   WebContent string
+  ContentType string
 }
 type Config struct {
-  BaseURL string
+  Version string           `yaml:"Version"`
-  Domains []string
+  BaseURL string           `yaml:"BaseURL"`
-  LogonDomain string
+  Domains []string         `yaml:"Domains"`
-  Services []interface{}
+  LogonDomain string       `yaml:"LogonDomain"`
+  InMail Service           `yaml:"InMail"`
+  OutMail Service          `yaml:"OutMail"`
+  Calendar Service         `yaml:"Calendar"`
+  AddressBook Service      `yaml:"AddressBook"`
+  OtherServices []Service  `yaml:"OtherServices"`
+
 }
 type Service struct {
-  Name string
+  Name string             `yaml:"Name"`
-  Enabled bool
+  Enabled bool            `yaml:"Enabled"`
-  Type string
+  Type string             `yaml:"Type"`
-  Server string
+  Server string           `yaml:"Server"`
-  Port int
+  Port int                `yaml:"Port"`
-  SocketType string
+  SocketType string       `yaml:"SocketType"`
-  SPA bool
+  SPA bool                `yaml:"SPA"`
-  UsernameIsFQDN bool
+  UsernameIsFQDN bool     `yaml:"UsernameIsFQDN"`
-  NoAuthRequired bool
+  NoAuthRequired bool     `yaml:"NoAuthRequired"`
-  Authentication string
+  Authentication string   `yaml:"Authentication"`
   // For Outgoing Mail
-  POPAuth bool
+  POPAuth bool            `yaml:"POPAuth"`
-  SMTPLast bool
+  SMTPLast bool           `yaml:"SMTPLast"`
   // For WebMail (Unused)
-  UsernameDivID string
+  UsernameDivID string    `yaml:"UsernameDivID"`
-  UsernameDivName string
+  UsernameDivName string  `yaml:"UsernameDivName"`
-  PasswordDivName string
+  PasswordDivName string  `yaml:"PasswordDivName"`
-  SubmitButtonID string
+  SubmitButtonID string   `yaml:"SubmitButtonID"`
-  SubmitButtonName string
+  SubmitButtonName string `yaml:"SubmitButtonName"`
+}
+type Response struct {
+  Url string              `json:"url"`
+  ContentType string      `json:"content_type"`
+  Message string          `json:"message"`
+  Content []interface{}   `json:"content"`
+}
+type MSAutodiscoverJSONResponse struct {
+  // More work to do - handling of MS Autodiscover.json requests
+  Protocol string
+  Url string
+}
+type MSAutodiscoverJSONError struct{
+  ErrorCode string
+  ErrorMessage string
 }

src/templates/autoconfig.html

@@ -1,7 +1,13 @@
-<!--  The below link has config-v1.1.xml information
+
- https://wiki.mozilla.org/Thunderbird:Autoconfiguration:ConfigFileFormat -->
+<h1>Go templates</h1>
+<p>The user is {{ .Name }}</p>
+<h2>Skills:</h2>
+{{ range .Skills }}
+    <p>{{ . }}</p>
+{{ end }}
+
 <clientConfig version="1.1">
- <emailProvider id="<?php echo Core::$Config["PrimaryDomain"]?>">
+ <emailProvider id="<?php echo Core::$Config["PrimaryDomain"]?>">{{ . }}
    <?php foreach (Core::$Config["Domain"] as $domain){ ?>
    <domain><?php echo $domain; ?></domain>
    <?php } ?>

src/web/handler/handler.go

@@ -12,6 +12,9 @@ func WebHandler(w http.ResponseWriter, r *http.Request) {
   ThisSession.ResponseWriter = w
   ThisSession.Request = r
   ThisSession.Path = strings.ToLower(r.URL.Path[1:])
+  if ThisSession.Path == "" {
+    ThisSession.Path = "none"
+  }
 
   switch ThisSession.Path {
   case "mail/config-v1.1.xml":
@@ -20,6 +23,8 @@ func WebHandler(w http.ResponseWriter, r *http.Request) {
     ThisSession.WebContent = responses.MsAutoDiscoverXML()
   case "autodiscover/autodiscover.json":
     ThisSession.WebContent = responses.MsAutoDiscoverJSON()
+  case "get/config":
+    ThisSession.WebContent = responses.OurConfig()
   default:
     ThisSession.WebContent = responses.DefaultResponse()
   }
@@ -28,5 +33,6 @@ func WebHandler(w http.ResponseWriter, r *http.Request) {
 }
 
 func writeWebOutput () {
+  ThisSession.ResponseWriter.Header().Set("Content-Type", ThisSession.ContentType)
   fmt.Fprintf(ThisSession.ResponseWriter, ThisSession.WebContent)
 }

src/web/responses/responses.go

@@ -1,6 +1,27 @@
 package responses
-
+import (
+  "mailautoconf/global"
+  . "mailautoconf/structs"
+  "html/template"
+  // "fmt"
+)
 func MozAutoconfig() string {
+  // The below link has config-v1.1.xml information
+  // https://wiki.mozilla.org/Thunderbird:Autoconfiguration:ConfigFileFormat
+  tmpl := "templates/autoconfig.html"
+  t := template.Must(template.ParseFiles(tmpl))
+  data := struct {
+        Name string
+        Skills []string
+    }{
+        Name: "John Doe",
+        Skills: []string{
+            "C++",
+            "Java",
+            "Python",
+        },
+    }
+  t.Execute(global.ThisSession.ResponseWriter, data)
   return ""
 }
 func MsAutoDiscoverXML() string {
@@ -10,5 +31,15 @@ func MsAutoDiscoverJSON() string {
   return ""
 }
 func DefaultResponse() string {
-  return ""
+  response := Response{}
+  response.Url = global.ThisSession.Path
+  global.ThisSession.ContentType = "application/json"
+  response.ContentType = global.ThisSession.ContentType
+  response.Message = "Success! Things are working! Please request a valid URL i.e. /mail/config-v1.1.xml";
+  return global.JSONify(response)
+}
+func OurConfig() string {
+  global.ThisSession.ContentType = "application/json"
+  content := global.JSONify(global.MainConfig)
+  return content
 }