From b8484db9e459cd786ccaa464c267cda42ced7412 Mon Sep 17 00:00:00 2001 From: Akilan Date: Fri, 14 Oct 2022 20:40:24 +0400 Subject: [PATCH] cleaned up Webgatewayupload code and added SSL --- main.go | 399 +++++++++++++++++++++++------------------ templates/upload.html | 141 ++++++++++++--- templates/upload2.html | 119 ------------ 3 files changed, 336 insertions(+), 323 deletions(-) delete mode 100644 templates/upload2.html diff --git a/main.go b/main.go index 4efe3ce..a294fbc 100644 --- a/main.go +++ b/main.go @@ -1,239 +1,286 @@ package main import ( - "bytes" - "encoding/hex" - "encoding/json" - "errors" - "fmt" - "github.com/PeernetOfficial/core" - "github.com/PeernetOfficial/core/btcec" - "github.com/PeernetOfficial/core/webapi" - "github.com/gin-gonic/gin" - "github.com/google/uuid" - "io" - "io/ioutil" - "mime/multipart" - "net/http" - "time" - "flag" + "bytes" + "encoding/hex" + "encoding/json" + "errors" + "flag" + "fmt" + "github.com/PeernetOfficial/core" + "github.com/PeernetOfficial/core/btcec" + "github.com/PeernetOfficial/core/webapi" + "github.com/gin-gonic/gin" + "github.com/google/uuid" + "io" + "io/ioutil" + "mime/multipart" + "net/http" + "time" ) // Variables for the flags to get the address var ( - BackEndApiAddress *string - WebpageAddress *string - SSL *bool + // BackEndApiAddress Refers to the Peernet address ex:
: + BackEndApiAddress *string + // WebpageAddress Refers to the address for upload webgate server + WebpageAddress *string + // SSL To ensure SSL is required checks if SSL is required and subsequently + // checks if the certificate is provided + SSL *bool + // Certificate SSL Certificate file + Certificate *string + // Key SSL Key file + Key *string + // BackendAddressWithHTTP ex: http://
: + BackendAddressWithHTTP string ) +// ------------------------------------------------------------------------------------------------------------- +// ---------------------------------------- Initialize flags and run Peernet --------------------------------- +// ------------------------------------------------------------------------------------------------------------- + +// init reading flags before any part of the code is executed func init() { - BackEndApiAddress = flag.String("BackEndApiAddress", "0.0.0.0:8088", "current environment") - WebpageAddress = flag.String("WebpageAddress", "0.0.0.0:8098", "current environment") - SSL = flag.Bool("SSL", false, "Flag to check if the SSL certificate is enabled or not") + BackEndApiAddress = flag.String("BackEndApiAddress", "localhost:8088", "current environment") + WebpageAddress = flag.String("WebpageAddress", "localhost:8098", "current environment") + SSL = flag.Bool("SSL", false, "Flag to check if the SSL certificate is enabled or not") + Certificate = flag.String("Certificate", "server.crt", "SSL Certificate file") + Key = flag.String("Key", "server.key", "SSL Key file") } -// Initializes Peernet +// InitPeernet Initializes Peernet backend func InitPeernet() *core.Backend { - backend, status, err := core.Init("Your application/1.0", "Config.yaml", nil, nil) - if status != core.ExitSuccess { - fmt.Printf("Error %d initializing backend: %s\n", status, err.Error()) - return nil - } + backend, status, err := core.Init("Your application/1.0", "Config.yaml", nil, nil) + if status != core.ExitSuccess { + fmt.Printf("Error %d initializing backend: %s\n", status, err.Error()) + return nil + } - return backend + return backend } -// Starts the WebAPI and peernet +// RunPeernet Starts the WebAPI and peernet func RunPeernet(backend *core.Backend) { - webapi.Start(backend, []string{*BackEndApiAddress}, false, "", "", 10*time.Second, 10*time.Second, uuid.Nil) - backend.Connect() + webapi.Start(backend, []string{*BackEndApiAddress}, false, "", "", 10*time.Second, 10*time.Second, uuid.Nil) + backend.Connect() - for { + for { - } + } } +// ------------------------------------------------------------------------------------------------------------- +// ---------------------- Custom Structs required parse information from the Peernet backend API --------------- +// ------------------------------------------------------------------------------------------------------------- +// 1. Storing file in the warehouse +// 2. Storing file metadata in the blockchain + +// ----------------------------------------------------------------------------------------- +// ---------------------------------- Warehouse related structs --------------------------- + type WarehouseResult struct { - Status int `json:"status"` - Hash []byte `json:"hash"` + Status int `json:"status"` + Hash []byte `json:"hash"` } +// ----------------------------------------------------------------------------------------- +// -------------------------------- Blockchain related structs ----------------------------- + +// BlockchainRequest blockchain backend API request struct type BlockchainRequest struct { - Files []File `json:"files"` + Files []File `json:"files"` } type File struct { - Hash []byte `json:"hash"` - Type int `json:"type"` - Name string `json:"name"` -} - -func AddFileWarehouse(file io.Reader) *WarehouseResult { - url := *BackEndApiAddress + "/warehouse/create" - - req, err := http.NewRequest("POST", url, file) - //req.Header.Set("X-Custom-Header", "myvalue") - //req.Header.Set("Content-Type", "application/json") - - client := &http.Client{} - resp, err := client.Do(req) - if err != nil { - panic(err) - } - defer resp.Body.Close() - - //fmt.Println("response Status:", resp.Status) - //fmt.Println("response Headers:", resp.Header) - body, _ := ioutil.ReadAll(resp.Body) - //fmt.Println("response Body:", string(body)) - var result WarehouseResult - err = json.Unmarshal(body, &result) - if err != nil { - fmt.Println(err) - } - - return &result + Hash []byte `json:"hash"` + Type int `json:"type"` + Name string `json:"name"` } +// BlockchainResponse blockchain backend API response struct type BlockchainResponse struct { - Status int `json:"status"` - Height int `json:"height"` - Version int `json:"version"` + Status int `json:"status"` + Height int `json:"height"` + Version int `json:"version"` } -// The follwoing function adds the filename and hash to the blockchain -func AddFileToBlockchain(hash []byte, filename string) *BlockchainResponse { - url := *BackEndApiAddress + "/blockchain/file/add" +// ----------------------------------------------------------------------------------------- +// ----------------------------------------------------------------------------------------- - // Create file object for post - var blockchainRequest BlockchainRequest - var files File - files.Name = filename - files.Hash = hash - files.Type = 0 - blockchainRequest.Files = append(blockchainRequest.Files, files) +// ------------------------------------------------------------------------------------------------------------- +// -------------------------------------- Functions to call Peernet Apis --------------------------------------- +// ------------------------------------------------------------------------------------------------------------- +// 1. Storing file in the warehouse (/warehouse/create) +// 2. Storing file metadata in the blockchain (/blockchain/file/add) - Byte, err := json.Marshal(blockchainRequest) +// ----------------------------------------------------------------------------------------- +// ---------------------------------- Warehouse related ------------------------------------ - // convert bytes - req, err := http.NewRequest("POST", url, bytes.NewBuffer(Byte)) - //req.Header.Set("X-Custom-Header", "myvalue") - req.Header.Set("Content-Type", "application/json") +// AddFileWarehouse API call for (Storing file in the warehouse) +func AddFileWarehouse(file io.Reader) *WarehouseResult { + url := BackendAddressWithHTTP + "/warehouse/create" - client := &http.Client{} - resp, err := client.Do(req) - if err != nil { - panic(err) - } - defer resp.Body.Close() + req, err := http.NewRequest("POST", url, file) + //req.Header.Set("X-Custom-Header", "myvalue") + //req.Header.Set("Content-Type", "application/json") - //fmt.Println("response Status:", resp.Status) - //fmt.Println("response Headers:", resp.Header) - body, _ := ioutil.ReadAll(resp.Body) - //fmt.Println("response Body:", string(body)) - var result BlockchainResponse - err = json.Unmarshal(body, &result) - if err != nil { - return nil - } + client := &http.Client{} + resp, err := client.Do(req) + if err != nil { + panic(err) + } + defer resp.Body.Close() - return &result + //fmt.Println("response Status:", resp.Status) + //fmt.Println("response Headers:", resp.Header) + body, _ := ioutil.ReadAll(resp.Body) + //fmt.Println("response Body:", string(body)) + var result WarehouseResult + err = json.Unmarshal(body, &result) + if err != nil { + fmt.Println(err) + } + + return &result } // UploadFile Simple abstracted function to add files to peernet core func UploadFile(backend *core.Backend, file *multipart.File, header *multipart.FileHeader) (*btcec.PublicKey, *WarehouseResult, error) { - buf := bytes.NewBuffer(nil) - if _, err := io.Copy(buf, *file); err != nil { - return nil, nil, errors.New("io.Copy not successful") - } + buf := bytes.NewBuffer(nil) + if _, err := io.Copy(buf, *file); err != nil { + return nil, nil, errors.New("io.Copy not successful") + } - // adds file to warehouse - warehouseResult := AddFileWarehouse(buf) - fmt.Println(warehouseResult.Hash) - // current using default port for Peernet api which is 8080 - // First add file to warehouse + // adds file to warehouse + warehouseResult := AddFileWarehouse(buf) + fmt.Println(warehouseResult.Hash) + // current using default port for Peernet api which is 8080 + // First add file to warehouse - // Adds the file to a blockchain - Blockchainfo := AddFileToBlockchain(warehouseResult.Hash, header.Filename) - if Blockchainfo == nil { - return nil, nil, errors.New("add file to blockchain not successful") - } + // Adds the file to a blockchain + Blockchainfo := AddFileToBlockchain(warehouseResult.Hash, header.Filename) + if Blockchainfo == nil { + return nil, nil, errors.New("add file to blockchain not successful") + } - _, publicKey := backend.ExportPrivateKey() - fmt.Println(hex.EncodeToString(publicKey.SerializeCompressed())) + _, publicKey := backend.ExportPrivateKey() + fmt.Println(hex.EncodeToString(publicKey.SerializeCompressed())) - return publicKey, warehouseResult, nil + return publicKey, warehouseResult, nil } -// Add files +// ----------------------------------------------------------------------------------------- +// ----------------------------------- Blockchain related --------------------------------- + +// AddFileToBlockchain The follwoing function adds the filename and hash to the blockchain +func AddFileToBlockchain(hash []byte, filename string) *BlockchainResponse { + url := BackendAddressWithHTTP + "/blockchain/file/add" + + // Create file object for post + var blockchainRequest BlockchainRequest + var files File + files.Name = filename + files.Hash = hash + files.Type = 0 + blockchainRequest.Files = append(blockchainRequest.Files, files) + + Byte, err := json.Marshal(blockchainRequest) + + // convert bytes + req, err := http.NewRequest("POST", url, bytes.NewBuffer(Byte)) + //req.Header.Set("X-Custom-Header", "myvalue") + req.Header.Set("Content-Type", "application/json") + + client := &http.Client{} + resp, err := client.Do(req) + if err != nil { + panic(err) + } + defer resp.Body.Close() + + body, _ := ioutil.ReadAll(resp.Body) + + var result BlockchainResponse + err = json.Unmarshal(body, &result) + if err != nil { + return nil + } + + return &result +} + +// ----------------------------------------------------------------------------------------- +// ----------------------------------------------------------------------------------------- + +// ------------------------------------------------------------------------------------------------------------- +// --------------------------------------------- Main function ------------------------------------------------- +// ------------------------------------------------------------------------------------------------------------- + func main() { + // Parsing flags + flag.Parse() - // check if SSL is used or not - if *SSL { - *BackEndApiAddress = "https://" + *BackEndApiAddress - } else { - *BackEndApiAddress = "http://" + *BackEndApiAddress - } + // Start peernet + backend := InitPeernet() + go RunPeernet(backend) - // Start peernet - backend := InitPeernet() - go RunPeernet(backend) + r := gin.Default() + r.LoadHTMLGlob("templates/*.html") + r.Static("/templates", "./templates") + r.GET("/upload", func(c *gin.Context) { + c.HTML(http.StatusOK, "upload.html", nil) + }) - r := gin.Default() - r.LoadHTMLGlob("templates/*.html") - r.Static("/templates", "./templates") - r.GET("/upload", func(c *gin.Context) { - c.HTML(http.StatusOK, "upload2.html", nil) - }) + r.POST("/uploadFile", func(c *gin.Context) { + file, header, err := c.Request.FormFile("file") + defer file.Close() - r.POST("/uploadFile", func(c *gin.Context) { - file, header, err := c.Request.FormFile("file") - defer file.Close() + if err != nil { + fmt.Println(err) + } - if err != nil { - fmt.Println(err) - } + publicKey, warehouseResult, err := UploadFile(backend, &file, header) + if err != nil { + fmt.Println(err) + } - publicKey, warehouseResult, err := UploadFile(backend, &file, header) - if err != nil { - fmt.Println(err) - } + c.HTML(http.StatusOK, "upload.html", gin.H{ + "hash": hex.EncodeToString(warehouseResult.Hash), + "filename": header.Filename, + "size": header.Size, + "link": "https://peer.ae/" + hex.EncodeToString(publicKey.SerializeCompressed()) + "/" + hex.EncodeToString(warehouseResult.Hash), + "address": BackendAddressWithHTTP, + }) - c.HTML(http.StatusOK, "upload2.html", gin.H{ - "hash": hex.EncodeToString(warehouseResult.Hash), - "filename": header.Filename, - "size": header.Size, - "link": "https://peer.ae/" + hex.EncodeToString(publicKey.SerializeCompressed()) + "/" + hex.EncodeToString(warehouseResult.Hash), - }) + }) - }) + // Implement CURL script to ensure linux users can upload directly + // the Cli like https://bashupload.com + // Ex: curl http://localhost:8080/uploadCurl -F add=@ + r.POST("/uploadCurl", func(c *gin.Context) { + file, header, err := c.Request.FormFile("add") + defer file.Close() - // Implement CURL script to ensure linux users can upload directly - // the Cli like https://bashupload.com - // Ex: curl peer.ae/upload -T your_file.txt + if err != nil { + fmt.Println(err) + } - r.POST("/uploadCurl", func(c *gin.Context) { - file, header, err := c.Request.FormFile("add") - defer file.Close() + publicKey, warehouseResult, err := UploadFile(backend, &file, header) + if err != nil { + fmt.Println(err) + } - if err != nil { - fmt.Println(err) - } + link := "https://peer.ae/" + hex.EncodeToString(publicKey.SerializeCompressed()) + "/" + hex.EncodeToString(warehouseResult.Hash) + c.Data(http.StatusOK, "plain/text", []byte(link)) + }) - publicKey, warehouseResult, err := UploadFile(backend, &file, header) - if err != nil { - fmt.Println(err) - } - - link := "https://peer.ae/" + hex.EncodeToString(publicKey.SerializeCompressed()) + "/" + hex.EncodeToString(warehouseResult.Hash) - c.Data(http.StatusOK, "plain/text", []byte(link)) - // c.JSON(http.StatusOK, gin.H{ - // "hash": hex.EncodeToString(warehouseResult.Hash), - // "filename": header.Filename, - // "size": header.Size, - // "link": "https://peer.ae/" + hex.EncodeToString(publicKey.SerializeCompressed()) + "/" + hex.EncodeToString(warehouseResult.Hash), - //}) - }) - - r.Run(*WebpageAddress) + // check if SSL is used or not + if *SSL { + BackendAddressWithHTTP = "https://" + *BackEndApiAddress + r.RunTLS(*WebpageAddress, *Certificate, *Key) + } else { + BackendAddressWithHTTP = "http://" + *BackEndApiAddress + r.Run(*WebpageAddress) + } } diff --git a/templates/upload.html b/templates/upload.html index 2924044..6ad39ae 100644 --- a/templates/upload.html +++ b/templates/upload.html @@ -1,34 +1,119 @@ - + + - - - Peernet upload file + Peernet Download file + + - - - - - - -
-
- - -

or

- 
curl http://localhost:8080/uploadCurl -F add=@<file name>
-
- - {{ if .hash }} -

hash: {{ .hash }}

- {{end}} -
+ + + + + + + + + +
+
+
+
+
+
+
+

Upload file to peernet

+
+
+
+
+ + +
+ + +
+

or

+

curl {{ .address }}/uploadCurl -F add=@<file name>

+ +
+
+ + +
+
+ +
+ +
+ +
+
+
+
+ +
+ + + + + - - - - - - + \ No newline at end of file diff --git a/templates/upload2.html b/templates/upload2.html deleted file mode 100644 index a9437e3..0000000 --- a/templates/upload2.html +++ /dev/null @@ -1,119 +0,0 @@ - - - - - Peernet Download file - - - - - - - - - - - - -
-
-
-
-
-
-
-

Upload file to peernet

-
-
-
-
- - -
- - -
-

or

-

curl http://localhost:8080/uploadCurl -F add=@<file name>

- -
-
- - -
-
- -
- -
- -
-
-
-
- -
- - - - - - - - - \ No newline at end of file