From 06145a1445179553f946db0491aecb558aa312ea Mon Sep 17 00:00:00 2001
From: Theo S Schult <theo.sschult@gmail.com>
Date: Tue, 11 Feb 2025 21:50:50 -0300
Subject: [PATCH] Refactor User model and implement show subcommand
---
.gitignore | 2 +
cmd/user/create.go | 23 +++--
cmd/user/mod.go | 16 ++--
cmd/user/show.go | 227 ++++++++++++++++++++++++++++++++++++++++++++-
go.mod | 10 +-
go.sum | 113 ++++++++++++++++++++++
model/user.go | 49 ++++++----
7 files changed, 397 insertions(+), 43 deletions(-)
diff --git a/.gitignore b/.gitignore
index 97caac8..142bcc0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
useradm
build.sh
+useradm.py
+full_commands.py
diff --git a/cmd/user/create.go b/cmd/user/create.go
index 7022dee..57a5e16 100644
--- a/cmd/user/create.go
+++ b/cmd/user/create.go
@@ -1,9 +1,9 @@
package user
import (
- "bufio"
- "fmt"
"os"
+ "fmt"
+ "bufio"
"strings"
"github.com/spf13/cobra"
@@ -50,7 +50,7 @@ func createUserFunc(cmd *cobra.Command, args []string) error {
if err != nil {
return err
}
- userGroup, err := cmd.Flags().GetString("group")
+ userGID, err := cmd.Flags().GetString("group")
if err != nil {
return err
}
@@ -58,7 +58,7 @@ func createUserFunc(cmd *cobra.Command, args []string) error {
if err != nil {
return err
}
- userPath, err := cmd.Flags().GetString("path")
+ userWebdir, err := cmd.Flags().GetString("path")
if err != nil {
return err
}
@@ -84,19 +84,20 @@ func createUserFunc(cmd *cobra.Command, args []string) error {
}
user := model.User{
+ UID: ifThenElse(userLogin != "", userLogin, "[auto-generate]"),
+ GID: userGID,
+ GRR: userGRR,
Name: userName,
Ltype: userType,
- Group: userGroup,
- GRR: userGRR,
- Path: userPath,
- Login: ifThenElse(userLogin != "", userLogin, "[auto-generate]"),
Shell: userShell,
+ Webdir: userWebdir,
+ Status: userStatus,
Homedir: userHomedir,
Password: ifThenElse(userPassword != "", "[set]", "[auto-generate]"),
- Status: userStatus,
}
fmt.Println(user.ToString())
+ fmt.Printf (" Passwd: %v", user.Password)
if !confirm {
fmt.Print("Proceed with user creation? [y/N] ")
@@ -114,8 +115,6 @@ func createUserFunc(cmd *cobra.Command, args []string) error {
}
func ifThenElse(condition bool, a string, b string) string {
- if condition {
- return a
- }
+ if condition { return a }
return b
}
diff --git a/cmd/user/mod.go b/cmd/user/mod.go
index 5dc5b03..368802c 100644
--- a/cmd/user/mod.go
+++ b/cmd/user/mod.go
@@ -52,7 +52,7 @@ func modifyUserFunc(cmd *cobra.Command, args []string) error {
if err != nil {
return err
}
- userGroupNew, err := cmd.Flags().GetString("group")
+ userGIDNew, err := cmd.Flags().GetString("group")
if err != nil {
return err
}
@@ -60,11 +60,11 @@ func modifyUserFunc(cmd *cobra.Command, args []string) error {
if err != nil {
return err
}
- userPathNew, err := cmd.Flags().GetString("path")
+ userWebdirNew, err := cmd.Flags().GetString("path")
if err != nil {
return err
}
- userLogin, err := cmd.Flags().GetString("login")
+ userUID, err := cmd.Flags().GetString("login")
if err != nil {
return err
}
@@ -96,15 +96,15 @@ func modifyUserFunc(cmd *cobra.Command, args []string) error {
}
userMod := model.User{
- Name: userNameNew,
- Group: userGroupNew,
+ UID: userUID,
+ GID: userGIDNew,
GRR: userGRRNew,
- Path: userPathNew,
- Login: userLogin,
+ Name: userNameNew,
Shell: userShellNew,
+ Webdir: userWebdirNew,
+ Status: userStatusNew,
Homedir: userHomedirNew,
Password: userPasswordNew,
- Status: userStatusNew,
}
if cmd.Flags().Changed("password") || block || unblock {
diff --git a/cmd/user/show.go b/cmd/user/show.go
index dffc3b9..0e42af1 100644
--- a/cmd/user/show.go
+++ b/cmd/user/show.go
@@ -1,8 +1,231 @@
package user
-import "github.com/spf13/cobra"
+import (
+ "os"
+ "fmt"
+ "log"
+ "strings"
+
+ "github.com/spf13/cobra"
+ "github.com/go-ldap/ldap/v3"
+ "gitlab.c3sl.ufpr.br/tss24/useradm/model"
+)
var ShowCmd = &cobra.Command{
Use: "show",
- Short: "Display user information",
+ Short: "Search for users and show info",
+ RunE: searchUser,
+}
+
+func init() {
+ // Possible search fields
+ ShowCmd.Flags().StringP("grr", "r", "", "Search by user GRR")
+ ShowCmd.Flags().StringP("name", "n", "", "Search by user name (case sensitive)")
+ ShowCmd.Flags().StringP("login", "l", "", "Search by login")
+ ShowCmd.Flags().StringP("group", "g", "", "Search by user base group")
+ ShowCmd.Flags().StringP("status", "a", "", "Search by user status (Free/Blocked)")
+ ShowCmd.Flags().StringP("homedir", "d", "", "Search by user homedir")
+
+ // At least one is required!
+ ShowCmd.MarkFlagsOneRequired("grr", "name", "login", "group", "homedir", "status")
+}
+
+func searchUser(cmd *cobra.Command, args []string) error {
+ grr, err := cmd.Flags().GetString("grr")
+ if err != nil {
+ return err
+ }
+ name, err := cmd.Flags().GetString("name")
+ if err != nil {
+ return err
+ }
+ login, err := cmd.Flags().GetString("login")
+ if err != nil {
+ return err
+ }
+ group, err := cmd.Flags().GetString("group")
+ if err != nil {
+ return err
+ }
+ homedir, err := cmd.Flags().GetString("homedir")
+ if err != nil {
+ return err
+ }
+ status, err := cmd.Flags().GetString("status")
+ if err != nil {
+ return err
+ }
+
+ users := getUsers()
+
+ filtered := Filter(users, func(u model.User) bool {
+ return (grr == "" || strings.Contains(u.GRR, grr)) &&
+ (name == "" || strings.Contains(u.Name, name)) &&
+ (login == "" || strings.Contains(u.UID, login)) &&
+ (group == "" || strings.Contains(u.GID, group)) &&
+ (status == "" || strings.Contains(u.Status, status)) &&
+ (homedir == "" || strings.Contains(u.Homedir, homedir))
+ })
+
+ for i := range filtered {
+ fmt.Printf("%v\n\n",filtered[i].ToString())
+ }
+
+ return nil
+}
+
+// Generic function for filtering data types, in this case the model User
+func Filter[T any](slice []T, predicate func(T) bool) []T {
+ var result []T
+ for _, v := range slice {
+ if predicate(v) {
+ result = append(result, v)
+ }
+ }
+ return result
+}
+
+func getUsers() []model.User {
+ // Connect to the LDAP server
+ l, err := ldap.DialURL("ldapi:///")
+ if err != nil {
+ log.Fatal(err)
+ }
+ defer l.Close()
+
+ // Get admin credentials
+ password, err := getLDAPPassword("/etc/ldapscripts/ldapscripts.passwd")
+ if err != nil {
+ log.Fatalf("Failed to read LDAP password: %v", err)
+ }
+
+ // Bind using admin credentials
+ err = l.Bind("cn=admin,dc=c3local", password)
+ if err != nil {
+ log.Fatalf("Failed to bind with credentials: %v", err)
+ }
+
+ // Create the LDAP search request
+ searchRequest := ldap.NewSearchRequest(
+ "dc=c3local", // search base
+ ldap.ScopeWholeSubtree, // scope
+ ldap.NeverDerefAliases, // aliases
+ 0, // size limit
+ 0, // time limit
+ false, // types only
+ "(objectClass=posixAccount)",// filter
+ []string{"dn", "uid", "cn", "loginShell", "uidNumber", "gidNumber", "homeDirectory", "gecos"}, // attributes to return
+ nil,
+ )
+
+ // Perform the search
+ sr, err := l.Search(searchRequest)
+ if err != nil {
+ log.Fatalf("Failed to make LDAP search: %v", err)
+ }
+
+ var users []model.User
+
+ // Iterate over the search results
+ for _, entry := range sr.Entries {
+ gecos := entry.GetAttributeValue("gecos")
+ shell := entry.GetAttributeValue("loginShell")
+ gidNumber := entry.GetAttributeValue("gidNumber")
+
+ user := model.User{
+ DN: entry.DN,
+ UID: entry.GetAttributeValue("uid"),
+ Name: entry.GetAttributeValue("cn"),
+ Shell: shell,
+ UIDNumber: entry.GetAttributeValue("uidNumber"),
+ GIDNumber: gidNumber,
+ Homedir: entry.GetAttributeValue("homeDirectory"),
+ Gecos: gecos,
+ Status: ifThenElse(shell == "/bin/bash", "Free", "Blocked"),
+ }
+
+ // Query for the group name using gidNumber
+ groupName, err := getGroupNameByGID(l, gidNumber)
+ if err != nil {
+ log.Printf("Warning: Failed to find group name for gidNumber %s: %v", gidNumber, err)
+ user.GID = "Unknown"
+ } else {
+ user.GID = groupName
+ }
+
+ user = parseGecos(user)
+ users = append(users, user)
+ }
+ return users
+}
+
+func getLDAPPassword(path string) (string, error) {
+ passwd, err := os.ReadFile(path)
+ if err != nil {
+ return "", fmt.Errorf("Error reading password file: %w", err)
+ }
+
+ password := strings.TrimSpace(string(passwd))
+
+ return password, nil
+}
+
+// Campos do GECOS:
+// 0. Nome completo do titular da conta
+// 1. GRR do aluno
+// 2. Professor responsavel
+// 3. Curso/minicurso do usuario (ate para temporarios)
+// 4. Validade da conta (data maxima para delecao)
+// 5. Status da conta (Blocked/Free)
+// 6. Tipo de login (ini, first, last)
+// 7. to be continued...
+func parseGecos(user model.User) model.User {
+ result := [7]string{0: "_"}
+ for i := range result {
+ result[i] = "_"
+ }
+ parts := strings.Split(user.Gecos, ",")
+
+ for i := 0; i < len(parts) && i < 7; i++ {
+ if strings.TrimSpace(parts[i]) != "" {
+ result[i] = parts[i]
+ }
+ }
+
+ user.GRR = result[1]
+ user.Resp = result[2]
+ user.Course = result[3]
+ user.Expiry = result[4]
+ if user.Status == "_"{
+ user.Status = result[5]
+ }
+ user.Ltype = result[6]
+
+ return user
+}
+
+// Helper function to get group name by gidNumber
+func getGroupNameByGID(l *ldap.Conn, gidNumber string) (string, error) {
+ searchRequest := ldap.NewSearchRequest(
+ "dc=c3local", // search base
+ ldap.ScopeWholeSubtree, // scope
+ ldap.NeverDerefAliases, // aliases
+ 1, // size limit (one result expected)
+ 0, // time limit
+ false, // types only
+ fmt.Sprintf("(&(objectClass=posixGroup)(gidNumber=%s))", gidNumber), // filter by gidNumber
+ []string{"cn"}, // retrieve the group name (cn)
+ nil,
+ )
+
+ sr, err := l.Search(searchRequest)
+ if err != nil {
+ return "", fmt.Errorf("LDAP search failed: %w", err)
+ }
+
+ if len(sr.Entries) == 0 {
+ return "", fmt.Errorf("no group found with gidNumber %s", gidNumber)
+ }
+
+ return sr.Entries[0].GetAttributeValue("cn"), nil
}
diff --git a/go.mod b/go.mod
index 7ad4e17..3f874a8 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,15 @@ module gitlab.c3sl.ufpr.br/tss24/useradm
go 1.19
require (
+ github.com/go-ldap/ldap/v3 v3.4.10
+ github.com/spf13/cobra v1.8.1
+)
+
+require (
+ github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
+ github.com/go-asn1-ber/asn1-ber v1.5.7 // indirect
+ github.com/google/uuid v1.6.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
- github.com/spf13/cobra v1.8.1 // indirect
github.com/spf13/pflag v1.0.5 // indirect
+ golang.org/x/crypto v0.31.0 // indirect
)
diff --git a/go.sum b/go.sum
index 912390a..6681d94 100644
--- a/go.sum
+++ b/go.sum
@@ -1,10 +1,123 @@
+github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 h1:mFRzDkZVAjdal+s7s0MwaRv9igoPqLRdzOLzw/8Xvq8=
+github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU=
+github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa h1:LHTHcTQiSGT7VVbI0o4wBRNQIgn917usHWOd6VAffYI=
+github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa/go.mod h1:cEWa1LVoE5KvSD9ONXsZrj0z6KqySlCCNKHlLzbqAt4=
github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/go-asn1-ber/asn1-ber v1.5.7 h1:DTX+lbVTWaTw1hQ+PbZPlnDZPEIs0SS/GCZAl535dDk=
+github.com/go-asn1-ber/asn1-ber v1.5.7/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
+github.com/go-ldap/ldap/v3 v3.4.10 h1:ot/iwPOhfpNVgB1o+AVXljizWZ9JTp7YF5oeyONmcJU=
+github.com/go-ldap/ldap/v3 v3.4.10/go.mod h1:JXh4Uxgi40P6E9rdsYqpUtbW46D9UTjJ9QSwGRznplY=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
+github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
+github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
+github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
+github.com/jcmturner/aescts/v2 v2.0.0 h1:9YKLH6ey7H4eDBXW8khjYslgyqG2xZikXP0EQFKrle8=
+github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs=
+github.com/jcmturner/dnsutils/v2 v2.0.0 h1:lltnkeZGL0wILNvrNiVCR6Ro5PGU/SeBvVO/8c/iPbo=
+github.com/jcmturner/dnsutils/v2 v2.0.0/go.mod h1:b0TnjGOvI/n42bZa+hmXL+kFJZsFT7G4t3HTlQ184QM=
+github.com/jcmturner/gofork v1.7.6 h1:QH0l3hzAU1tfT3rZCnW5zXl+orbkNMMRGJfdJjHVETg=
+github.com/jcmturner/gofork v1.7.6/go.mod h1:1622LH6i/EZqLloHfE7IeZ0uEJwMSUyQ/nDd82IeqRo=
+github.com/jcmturner/goidentity/v6 v6.0.1 h1:VKnZd2oEIMorCTsFBnJWbExfNN7yZr3EhJAxwOkZg6o=
+github.com/jcmturner/goidentity/v6 v6.0.1/go.mod h1:X1YW3bgtvwAXju7V3LCIMpY0Gbxyjn/mY9zx4tFonSg=
+github.com/jcmturner/gokrb5/v8 v8.4.4 h1:x1Sv4HaTpepFkXbt2IkL29DXRf8sOfZXo8eRKh687T8=
+github.com/jcmturner/gokrb5/v8 v8.4.4/go.mod h1:1btQEpgT6k+unzCwX1KdWMEwPPkkgBtP+F6aCACiMrs=
+github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZY=
+github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
+golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
+golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
+golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
+golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
+golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
+golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
+golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
+golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
+golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
+golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
+golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
+golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
+golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
+golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/model/user.go b/model/user.go
index 116f8e9..1b6cbac 100644
--- a/model/user.go
+++ b/model/user.go
@@ -3,28 +3,37 @@ package model
import "fmt"
type User struct {
- GRR string
- Path string
- Name string
- Ltype string
- Login string
- Group string
- Shell string
- Status string
- Homedir string
- Password string
+ DN string
+ GRR string
+ UID string
+ GID string
+ Name string
+ Resp string
+ Ltype string
+ Gecos string
+ Shell string
+ Course string
+ Status string
+ Webdir string
+ Expiry string
+ Homedir string
+ Password string
+ GIDNumber string
+ UIDNumber string
}
func (u *User) ToString() string {
return fmt.Sprintf(`User:
- Name: %s
- Login: %s
- Type: %s
- Group: %s
- Shell: %s
- HomeDir: %s
- Password: %s
- WebPath: %s
- Status: %s`,
- u.Name, u.Login, u.Ltype, u.Group, u.Shell, u.Homedir, u.Password, u.Path, u.Status)
+ Name: %s
+ Login: %s
+ GRR: %s
+ Group: %s
+ Shell: %s
+ HomeDir: %s
+ Webdir: %s
+ Status: %s
+ Resp: %s
+ Course: %s
+ Expiry: %s`,
+ u.Name, u.UID, u.GRR, u.GID, u.Shell, u.Homedir, u.Webdir, u.Status, u.Resp, u.Course, u.Expiry)
}
--
GitLab