Bumbed v0.1.0

Signed-off-by: Vishal Rana <vr@labstack.com>

Author: vishr

.gitignore

@@ -1 +1,2 @@
-vendor
+build
+dist

Makefile

@@ -0,0 +1,9 @@
+VERSION = 0.1.0
+
+clean:
+	rm -rf build
+
+build: clean
+	xgo --targets=darwin-10.8/amd64,linux/amd64,linux/arm-6,linux/arm-7,linux/arm64,windows-8.0/amd64 --pkg cmd/tunnel -out build/tunnel-$(VERSION) github.com/labstack/tunnel
+
+.PHONY: clean build

cmd/http.go

@@ -8,26 +8,27 @@ import (
 	"github.com/spf13/cobra"
 )
 
-// httpCmd represents the http command
-var err error
-var httpCmd = &cobra.Command{
-	Use:   "http",
-	Short: "Forwards HTTP/HTTPS traffic from internet to a target address",
-	// Long:  ``,
-	Args: cobra.MinimumNArgs(1),
-	Run: func(cmd *cobra.Command, args []string) {
-		t := &tunnel.Tunnel{
-			Protocol:   "http",
-			RemoteHost: "0.0.0.0",
-			RemotePort: 80,
-		}
-		t.TargetHost, t.TargetPort, err = util.SplitHostPort(args[0])
-		if err != nil {
-			log.Fatalf("Failed to parse target address %v\n", err)
-		}
-		t.Create()
-	},
-}
+var (
+	err     error
+	httpCmd = &cobra.Command{
+		Use:   "http",
+		Short: "Forward HTTP/HTTPS traffic from internet to a target address",
+		// Long:  ``,
+		Args: cobra.MinimumNArgs(1),
+		Run: func(cmd *cobra.Command, args []string) {
+			t := &tunnel.Tunnel{
+				Protocol:   "http",
+				RemoteHost: "0.0.0.0",
+				RemotePort: 80,
+			}
+			t.TargetHost, t.TargetPort, err = util.SplitHostPort(args[0])
+			if err != nil {
+				log.Fatalf("Failed to parse target address %v\n", err)
+			}
+			t.Create()
+		},
+	}
+)
 
 func init() {
 	rootCmd.AddCommand(httpCmd)

cmd/root.go

@@ -4,27 +4,19 @@ import (
 	"fmt"
 	"os"
 
-	homedir "github.com/mitchellh/go-homedir"
+	"github.com/mitchellh/go-homedir"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
 
-var cfgFile string
-
-// rootCmd represents the base command when called without any subcommands
-var rootCmd = &cobra.Command{
-	Use:   "tunnel",
-	Short: "A brief description of your application",
-	Long: `A longer description that spans multiple lines and likely contains
-examples and usage of using your application. For example:
-
-Cobra is a CLI library for Go that empowers applications.
-This application is a tool to generate the needed files
-to quickly create a Cobra application.`,
-	// Uncomment the following line if your bare application
-	// has an action associated with it:
-	//	Run: func(cmd *cobra.Command, args []string) { },
-}
+var (
+	confFile string
+	rootCmd  = &cobra.Command{
+		Use:   "tunnel",
+		Short: "Tunnel lets you expose local servers to the internet securely",
+		Long:  ``,
+	}
+)
 
 // Execute adds all child commands to the root command and sets flags appropriately.
 // This is called by main.main(). It only needs to happen once to the rootCmd.
@@ -37,22 +29,14 @@ func Execute() {
 
 func init() {
 	cobra.OnInitialize(initConfig)
-
-	// Here you will define your flags and configuration settings.
-	// Cobra supports persistent flags, which, if defined here,
-	// will be global for your application.
-	rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.tunnel.yaml)")
-
-	// Cobra also supports local flags, which will only run
-	// when this action is called directly.
-	rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
+	rootCmd.PersistentFlags().StringVarP(&confFile, "config", "c", "", "config file (default is $HOME/.tunnel.yaml)")
 }
 
 // initConfig reads in config file and ENV variables if set.
 func initConfig() {
-	if cfgFile != "" {
+	if confFile != "" {
 		// Use config file from the flag.
-		viper.SetConfigFile(cfgFile)
+		viper.SetConfigFile(confFile)
 	} else {
 		// Find home directory.
 		home, err := homedir.Dir()
@@ -70,6 +54,6 @@ func initConfig() {
 
 	// If a config file is found, read it in.
 	if err := viper.ReadInConfig(); err == nil {
-		fmt.Println("Using config file:", viper.ConfigFileUsed())
+		// fmt.Println("Using config file:", viper.ConfigFileUsed())
 	}
 }

cmd/tcp.go

@@ -8,24 +8,26 @@ import (
 	"github.com/spf13/cobra"
 )
 
-// tcpCmd represents the tcp command
-var tcpCmd = &cobra.Command{
-	Use:   "tcp",
-	Short: "Forwards TCP traffic from internet to a target address",
-	// Long:  ``,
-	Run: func(cmd *cobra.Command, args []string) {
-		t := &tunnel.Tunnel{
-			Protocol:   "tcp",
-			RemoteHost: "0.0.0.0",
-			RemotePort: 0,
-		}
-		t.TargetHost, t.TargetPort, err = util.SplitHostPort(args[0])
-		if err != nil {
-			log.Fatalf("Failed to parse target address %v\n", err)
-		}
-		t.Create()
-	},
-}
+var (
+	tcpCmd = &cobra.Command{
+		Use:   "tcp",
+		Short: "Forward TCP traffic from internet to a target address",
+		// Long:  ``,
+		Args: cobra.MinimumNArgs(1),
+		Run: func(cmd *cobra.Command, args []string) {
+			t := &tunnel.Tunnel{
+				Protocol:   "tcp",
+				RemoteHost: "0.0.0.0",
+				RemotePort: 0,
+			}
+			t.TargetHost, t.TargetPort, err = util.SplitHostPort(args[0])
+			if err != nil {
+				log.Fatalf("Failed to parse target address %v\n", err)
+			}
+			t.Create()
+		},
+	}
+)
 
 func init() {
 	rootCmd.AddCommand(tcpCmd)

cmd/tls.go

@@ -8,24 +8,26 @@ import (
 	"github.com/spf13/cobra"
 )
 
-// tlsCmd represents the tls command
-var tlsCmd = &cobra.Command{
-	Use:   "tls",
-	Short: "Forwards TLS traffic from internet to a target address",
-	// Long: ``,
-	Run: func(cmd *cobra.Command, args []string) {
-		t := &tunnel.Tunnel{
-			Protocol:   "tls",
-			RemoteHost: "0.0.0.0",
-			RemotePort: 0,
-		}
-		t.TargetHost, t.TargetPort, err = util.SplitHostPort(args[0])
-		if err != nil {
-			log.Fatalf("Failed to parse target address %v\n", err)
-		}
-		t.Create()
-	},
-}
+var (
+	tlsCmd = &cobra.Command{
+		Use:   "tls",
+		Short: "Forward TLS traffic from internet to a target address",
+		// Long: ``,
+		Args: cobra.MinimumNArgs(1),
+		Run: func(cmd *cobra.Command, args []string) {
+			t := &tunnel.Tunnel{
+				Protocol:   "tls",
+				RemoteHost: "0.0.0.0",
+				RemotePort: 0,
+			}
+			t.TargetHost, t.TargetPort, err = util.SplitHostPort(args[0])
+			if err != nil {
+				log.Fatalf("Failed to parse target address %v\n", err)
+			}
+			t.Create()
+		},
+	}
+)
 
 func init() {
 	rootCmd.AddCommand(tlsCmd)

cmd/tunnel/main.go

@@ -1,17 +1,3 @@
-// Copyright © 2018 NAME HERE <EMAIL ADDRESS>
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
 package main
 
 import "github.com/labstack/tunnel/cmd"

cmd/version.go

@@ -6,15 +6,16 @@ import (
 	"github.com/spf13/cobra"
 )
 
-// versionCmd represents the version command
-var versionCmd = &cobra.Command{
-	Use:   "version",
-	Short: "Print the version of Tunnel",
-	// Long:  ``,
-	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Println("v0.0.1")
-	},
-}
+var (
+	versionCmd = &cobra.Command{
+		Use:   "version",
+		Short: "Print the version of Tunnel",
+		// Long:  ``,
+		Run: func(cmd *cobra.Command, args []string) {
+			fmt.Println("v0.1.0")
+		},
+	}
+)
 
 func init() {
 	rootCmd.AddCommand(versionCmd)

tunnel.go

@@ -35,10 +35,14 @@ func (t *Tunnel) Create() {
 			ssh.Password("password"),
 		},
 		HostKeyCallback: ssh.FixedHostKey(hostKey),
+		BannerCallback: func(message string) error {
+			fmt.Print(message)
+			return nil
+		},
 	}
 
 	// Connect
-	client, err := ssh.Dial("tcp", "localhost:2200", config)
+	client, err := ssh.Dial("tcp", "labstack.me:22", config)
 	if err != nil {
 		log.Fatalf("Failed to connect %v\n", err)
 	}