From ff105bf9e06a5692caa48f836f504d54f2b6a2dc Mon Sep 17 00:00:00 2001 From: Akilan Date: Sun, 20 Oct 2024 22:29:05 +0100 Subject: [PATCH] added map port response as JSON output --- cert.pem | 32 ++++++++++++++--------------- client/MAPPort.go | 17 +++++++++++----- cmd/action.go | 2 +- key.pem | 52 +++++++++++++++++++++++------------------------ 4 files changed, 55 insertions(+), 48 deletions(-) diff --git a/cert.pem b/cert.pem index ecd3b70..f9a2028 100644 --- a/cert.pem +++ b/cert.pem @@ -1,18 +1,18 @@ -----BEGIN CERTIFICATE----- -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 -----END CERTIFICATE----- diff --git a/client/MAPPort.go b/client/MAPPort.go index 71f3727..e65776a 100644 --- a/client/MAPPort.go +++ b/client/MAPPort.go @@ -6,10 +6,14 @@ import ( "net/http" ) -func MAPPort(port string, domainName string) (string, error) { +type ResponseMAPPort struct { + IPAddress string +} + +func MAPPort(port string, domainName string) (*ResponseMAPPort, error) { Config, err := config.ConfigInit(nil, nil) if err != nil { - return "", err + return nil, err } //if version == "version 6" { @@ -19,14 +23,17 @@ func MAPPort(port string, domainName string) (string, error) { //} resp, err := http.Get(URL) if err != nil { - return "", err + return nil, err } // Convert response to byte value byteValue, err := ioutil.ReadAll(resp.Body) if err != nil { - return "", err + return nil, err } - return string(byteValue), nil + var response ResponseMAPPort + response.IPAddress = string(byteValue) + + return &response, nil } diff --git a/cmd/action.go b/cmd/action.go index 4014cc9..6349d74 100644 --- a/cmd/action.go +++ b/cmd/action.go @@ -290,7 +290,7 @@ var CliAction = func(ctx *cli.Context) error { if err != nil { fmt.Println(err) } else { - fmt.Println(address) + client.PrettyPrint(address) } } diff --git a/key.pem b/key.pem index 8cc51ec..170c493 100644 --- a/key.pem +++ b/key.pem @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCmPWVMj/Vj15+M -u73NVZ2BbKqDb01dcpGcJnyzqt6iov3UAsgbZsC+FZiJ/e3veRPQJwdtT9fcmYi7 -GcoU0t3oRkjXuSkK5p4etO2e/ZBR7E7/JnAa55QM5duhBwZiNSqz0wIvkMcdIMry -kriF0eVF6gJZUxLYkqjVywgiCTN2eTCPTivoEP08ObJUD3r3RW8keGZtrwZDdtGf -wU5xE2UheMpS/FSo9iPl+uaNh61372mUcKDRIdH+q8BExZ2W6eujfpaa+SP8GX3F -4C0QVOM2XghN1x4whXs6xpdIyelutiDdrNtxnLffgZhLugLHWiNDWqjaWeCzUPKd -RozZDBWnAgMBAAECggEARkK+tLxHd7pjicSztLxRxKjb7I83QJ6yoi+2Fu3KCS0g -YOIIF2S3Y9+WyAPV85fV4u0L+4x6bJdLreB5g5GYDpreIKb2jM/p1oqbv83lmGpq -/PYO/aAQ996SlB12+j0EXlp5mwby0QHSJPIUISMUZxc/hOdSmMxrpWiZeGExKgni -Hy63Iw37WpbV0deArY37y80iQhaLuk/vX8IDPZb5yIobxerzYrbvgW+c09QXwVO0 -+2D9houWEa4+xdQsxR3+Mas8hXoknA3rYVBUxziih/TdbsvQCe/5bJh15ZtUlbvK -TTQjed6XVg4dDJ+QVAouKq/qxZwa7txIVey240S0AQKBgQDU6hm4MZhsxA+CYzPu -72YkvMtI5F4WYQek7Ogt3ztDgc67WCfKsgFG+0nYHe/ZfyqkpE3LkJQCCwCzYceD -0Wvus5uPmHVm0wsMwIaGMvtv1cAnC6W4hOkiuxIBeKREcX0AWE++FCUXov99LKQS -eGsBz7oM8CiYuY4Wsb1rQWCKAQKBgQDH4VhwLzNraX7jaxeUYD15itDWAkVSQCwB -Ty00IUDvP7ZwsC72P9/j7ZxvQNQGwPp2s7E4KqYdGBa8hAeDUJbwar+xUZW21j3G -rPEfHoMuewJBh1As3Fz/Ccj8ygbPiinUsqo8E6+kHLOdkYRf1Bm1JxUmKgeTRbF0 -REnEsvwPpwKBgALiiSatxVrz7SHfJjz+kWu+AyMhtQSom+noK90zQSJRB/QR5bgh -YVMM5JtBDJbt2i4Q69zuQJMmgwPrN0DZ/ZRmap0ve6fBBE1P7oKy/iUtyES/K6es -ZVxLHJtYfyFOSFtQ1wPEUhxX4Q5ZJH/7kbeckPDL8EDhgsNb9S0W3bABAoGATDXj -noKgvGew9c0zZGN9jQYcsjyTadUF8knaFnJHa/GDAlxqy4F3QFSsvM6fCSQzW2cQ -PzYjuBwjLyW4J51mr6xEArv0tY3iaAowtYjQw7wrFAkfzLsIykVU2O2+wwsPAAZP -WjC3W3+GDKIbMt6QHr4UFkUYNlLwYkBXUCRebykCgYBxCkWNg1UyAXlz2QmweQ0U -9pJLdlByPS+BgU+5/WogdC/IBqE3foYH2lVZLW3+cxWlae0tbiwVie7NAfGLu5sW -HVVLcRRFJ05/ne8iP4fPZze+7hyOPmS6mSvKtGyCFymMGBzjjr5hEdI3ALcX2Lvb -71+TtRvBdL94gzL4tEzFXQ== +MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDBRKzozuS2JIjH +r+F5mug1+65o3MkEWrvOCMjn5WoxOyxclJxA8WSZBCVOe5ptOrji6+l1MrZBTha4 +HgrFgG62ohoSgx+bKwb7zQIGof/EYJCBVwEg7JRMuWyPUWWS3vIyT9HFRr4J2Yum +mbA2GZvcJWEoGPvX/UHXQm9TUPv9JrvXJbqur/59xquT4Vx7fQpx6GLPISfn2yQE +wKILoL34d82G5KwVD2O94UNv3cB8u5nXwInqOotxkTT9v2EExwcAapurXjpQWfFX +0Dss1PHM89ZoWw/BlYeQhf2VhOrR8cY1hvged1Vv3sh9C5UEBbbTZ9mwefFvQYH6 +L+QgY/99AgMBAAECggEAag7BxFAk+j86QDqoRQ9Y9qbSowDl3tnbzcjMV1Vx3OpY +AcYbqRfO2JmJz3PM3rwm0YAccRAPK+8qUIdL6e3804RJQndqVMBb6LorrnAf5ygG +pLOWDvdEuoXWqR9F2j82MZ3Tw6p6hvU2yYn1RPrwqPJqSpLLQU/dXb87UEFUxyoQ +7bNBNzsulZNd70JJtvmieXU1tf88EdiIxv/Ua9ZRepkkLDJlt3BwsGK+JdVhOhN2 +zUjhlQ4HrErdY6C0rEX7gKznSaThaZb6RYZOLqBfe5nG/uQjw+OfltLEz4nR5xn2 +2F07T0a5hP4WvCgNQRBzsXGYNumJEuSkcadEw8hEkQKBgQD2RAnUlnQ99xqvz3QK +STptQcJOF07DQmEs6A8E7BHue/Z4+gYNtbyQ7NefDYBuGWOzUOXOJs6k//CCgcDe +ZzmtRPs3Sro8AfK0FS09r/OpXL+LPJjhSJ+YEjoVzERSDCvVNshuIO92zlDPITg8 +J9ZsPzXrm+Yh1f5gvSgvmgJodwKBgQDI6FsH7mdjW3bp1tGnF/SzqOBMutyZp7/9 +b7dtJhZNwdi4765JVtLAXDei5kht7NzVlH7GJGcrIen5emKBRS6JjDlhFcFw669V +biOiBrL/3Gu9irjLh2abSBE5r7GClelDLgmJ/JrpkRJRcBtfoPLsYIHtViNXz2CE +w2yf3D+IqwKBgDV7l0r1Fe+zL7eI7WGif67kvicphrB/RQ10pHZkMozBnUiuvAvU +MUykMzvWudKvbuitpAr+gJhzAS/GsDVc47jOp2RdtU58+dHEW5vvD5LzkqHRmj4r +AIYNR1Iel6PeAtL+X88TFg6ORhyF0Wm3GSlPHQ27QOKOT/2Ady7HWsiHAoGAAZ2U +tdCd9jeTEjhPAUf5CMTP4O4TvgySR6hxUihfP4rSglIzFZXkJfXX4LB3XqLr96+1 +AUTjq34fUolAZ4e14xdEktpI7u6GP2qeULw7DkGogCKwb7qMAa2nrc4S4FjyQj8J +hpmIaV5oRk1fevphWbNA+DacHCWnwgmMQxDTVfcCgYAxbQQFyRJ1B+WJtvE66cqA +T/DvgzevwqE4na+NNc6hApZt+kNoLODLUi6ikYimNzdtGnr4AIitvGR3J9qzFC+I ++d2F1ioSV4fpVD7idYDVkncME+pXzzGweg91k8ucHqcdU1k70lYTokGgm3DyClcP +76O6IS1URnFFXco9DGuDcA== -----END PRIVATE KEY-----