From 5a0ee4aaa7084f985984f908ff704fa79ca1215e Mon Sep 17 00:00:00 2001 From: Brendan Le Glaunec Date: Fri, 16 Feb 2018 15:00:27 +0100 Subject: [PATCH] Move repository to Ullaakut --- CONTRIBUTING.md | 2 +- Dockerfile | 8 +++--- LICENSE | 2 -- README.md | 30 +++++++++++----------- cameradar/cameradar.go | 6 ++--- cmrdr.go | 2 +- server/actor/server/webSocket.go | 2 +- server/adaptor/jsonrpc2/jsonrpc2.go | 2 +- server/adaptor/websocket/factoryMock.go | 2 +- server/adaptor/websocket/gorillaFactory.go | 2 +- server/main.go | 10 ++++---- server/service/handler.go | 4 +-- server/service/service.go | 2 +- 13 files changed, 36 insertions(+), 38 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 56cb8cd..17520e1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -43,7 +43,7 @@ When your pull request is created, GitHub will first check for conflicts, Codacy If GitHub reports conflicts with the develop branch, you should resolve them by yourself using your git command-line interface. The easiest and cleanest way is to use `git rebase -i origin/develop` and follow git's instructions. If Codacy reports new issues, they will be added in the comments of the PR to let you know what you should fix. -If Travis CI reports errors, you should be able to view the logs [by clicking here](https://travis-ci.org/EtixLabs/cameradar/builds) and you should fix it. No PR will be merged before all tests are passing correctly. +If Travis CI reports errors, you should be able to view the logs [by clicking here](https://travis-ci.org/Ullaakut/cameradar/builds) and you should fix it. No PR will be merged before all tests are passing correctly. ### Coding guidelines diff --git a/Dockerfile b/Dockerfile index b65b303..e965ad0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ # Build stage FROM golang:alpine AS build-env -COPY . /go/src/github.com/EtixLabs/cameradar -WORKDIR /go/src/github.com/EtixLabs/cameradar/cameradar +COPY . /go/src/github.com/Ullaakut/cameradar +WORKDIR /go/src/github.com/Ullaakut/cameradar/cameradar RUN apk update && \ apk upgrade && \ @@ -25,6 +25,6 @@ RUN apk --update add --no-cache nmap nmap-nselibs nmap-scripts \ curl-dev WORKDIR /app/cameradar -COPY --from=build-env /go/src/github.com/EtixLabs/cameradar/dictionaries/ /app/dictionaries/ -COPY --from=build-env /go/src/github.com/EtixLabs/cameradar/cameradar/ /app/cameradar/ +COPY --from=build-env /go/src/github.com/Ullaakut/cameradar/dictionaries/ /app/dictionaries/ +COPY --from=build-env /go/src/github.com/Ullaakut/cameradar/cameradar/ /app/cameradar/ ENTRYPOINT ["/app/cameradar/cameradar", "-r", "/app/dictionaries/routes", "-c", "/app/dictionaries/credentials.json"] \ No newline at end of file diff --git a/LICENSE b/LICENSE index 99a85f4..06bfd8a 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,3 @@ -Copyright 2017 EtixLabs - Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights diff --git a/README.md b/README.md index 5dab5e3..d3cc286 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,16 @@ # Cameradar -

+

## An RTSP stream access tool that comes with its library [![cameradar License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat)](#license) [![Docker Pulls](https://img.shields.io/docker/pulls/ullaakut/cameradar.svg?style=flat)](https://hub.docker.com/r/ullaakut/cameradar/) -[![Build](https://img.shields.io/travis/EtixLabs/cameradar/master.svg?style=flat)](https://travis-ci.org/EtixLabs/cameradar) -[![Coverage Status](https://coveralls.io/repos/github/EtixLabs/cameradar/badge.svg?branch=master)](https://coveralls.io/github/EtixLabs/cameradar?branch=master) -[![Go Report Card](https://goreportcard.com/badge/github.com/EtixLabs/cameradar)](https://goreportcard.com/report/github.com/EtixLabs/cameradar) -[![GoDoc](https://godoc.org/github.com/EtixLabs/cameradar?status.svg)](https://godoc.org/github.com/EtixLabs/cameradar) -[![Latest release](https://img.shields.io/github/release/EtixLabs/cameradar.svg?style=flat)](https://github.com/EtixLabs/cameradar/releases/latest) +[![Build](https://img.shields.io/travis/Ullaakut/cameradar/master.svg?style=flat)](https://travis-ci.org/Ullaakut/cameradar) +[![Coverage Status](https://coveralls.io/repos/github/Ullaakut/cameradar/badge.svg?branch=master)](https://coveralls.io/github/Ullaakut/cameradar?branch=master) +[![Go Report Card](https://goreportcard.com/badge/github.com/Ullaakut/cameradar)](https://goreportcard.com/report/github.com/Ullaakut/cameradar) +[![GoDoc](https://godoc.org/github.com/Ullaakut/cameradar?status.svg)](https://godoc.org/github.com/Ullaakut/cameradar) +[![Latest release](https://img.shields.io/github/release/Ullaakut/cameradar.svg?style=flat)](https://github.com/Ullaakut/cameradar/releases/latest) ### Cameradar allows you to @@ -20,7 +20,7 @@ * Launch automated dictionary attacks to get the **username and password** of the cameras * Retrieve a complete and user-friendly report of the results -

+

## Table of content @@ -66,8 +66,8 @@ e.g.: `docker run -t ullaakut/cameradar -t 192.168.100.0/24 -l` will scan the po Make sure you installed the dependencies mentionned above. -1. `go get github.com/EtixLabs/cameradar` -2. `cd $GOPATH/src/github.com/EtixLabs/cameradar` +1. `go get github.com/Ullaakut/cameradar` +2. `cd $GOPATH/src/github.com/Ullaakut/cameradar` 3. `glide install` 4. `cd cameradar` 5. `go install` @@ -86,11 +86,11 @@ The `cameradar` binary is now in your `$GOPATH/bin` ready to be used. See comman #### Installing the library -`go get github.com/EtixLabs/cameradar` +`go get github.com/Ullaakut/cameradar` After this command, the _cameradar_ library is ready to use. Its source will be in: - $GOPATH/src/pkg/github.com/EtixLabs/cameradar + $GOPATH/src/pkg/github.com/Ullaakut/cameradar You can use `go get -u` to update the package. @@ -100,7 +100,7 @@ Here is an overview of the exposed functions of this library: You can use the cameradar library for simple discovery purposes if you don't need to access the cameras but just to be aware of their existence. -

+

This describes the nmap time presets. You can pass a value between 1 and 5 as described in this table, to the NmapRun function. #### Attack @@ -111,7 +111,7 @@ If you already know which hosts and ports you want to attack, you can also skip Here are the different data models useful to use the exposed functions of the cameradar library. -

+

#### Dictionary loaders @@ -249,7 +249,7 @@ You can still find it under the 1.1.4 tag on this repo, however it was less perf > How to use the Cameradar library for my own project? -See the example in `/cameradar`. You just need to run `go get github.com/EtixLabs/cameradar` and to use the `cmrdr` package in your code. +See the example in `/cameradar`. You just need to run `go get github.com/Ullaakut/cameradar` and to use the `cmrdr` package in your code. > I want to scan my own localhost for some reason and it does not work! What's going on? @@ -270,7 +270,7 @@ Simply run `docker run -p 8554:8554 -e RTSP_USERNAME=admin -e RTSP_PASSWORD=1234 ## License -Copyright 2017 EtixLabs +Copyright 2017 Ullaakut Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/cameradar/cameradar.go b/cameradar/cameradar.go index 400d1f4..b90d05b 100644 --- a/cameradar/cameradar.go +++ b/cameradar/cameradar.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/EtixLabs/cameradar" + "github.com/Ullaakut/cameradar" curl "github.com/andelf/go-curl" "github.com/fatih/color" @@ -42,8 +42,8 @@ func parseArguments() error { pflag.StringP("target", "t", "", "The target on which to scan for open RTSP streams - required (ex: 172.16.100.0/24)") pflag.StringP("ports", "p", "554,8554", "The ports on which to search for RTSP streams") pflag.StringP("nmap-output", "o", "/tmp/cameradar_scan.xml", "The path where nmap will create its XML result file") - pflag.StringP("custom-routes", "r", "/src/github.com/EtixLabs/cameradar/dictionaries/routes", "The path on which to load a custom routes dictionary") - pflag.StringP("custom-credentials", "c", "/src/github.com/EtixLabs/cameradar/dictionaries/credentials.json", "The path on which to load a custom credentials JSON dictionary") + pflag.StringP("custom-routes", "r", "/src/github.com/Ullaakut/cameradar/dictionaries/routes", "The path on which to load a custom routes dictionary") + pflag.StringP("custom-credentials", "c", "/src/github.com/Ullaakut/cameradar/dictionaries/credentials.json", "The path on which to load a custom credentials JSON dictionary") pflag.IntP("speed", "s", 4, "The nmap speed preset to use") pflag.IntP("timeout", "T", 2000, "The timeout in miliseconds to use for attack attempts") pflag.BoolP("log", "l", false, "Enable the logs for nmap's output to stdout") diff --git a/cmrdr.go b/cmrdr.go index 929d502..1702c38 100644 --- a/cmrdr.go +++ b/cmrdr.go @@ -3,7 +3,7 @@ // IP Cameras, often for surveillance. // // A simple example usage of the library can be found in -// https://github.com/EtixLabs/cameradar/tree/master/cameradar +// https://github.com/Ullaakut/cameradar/tree/master/cameradar // // The example usage is complete enough for most users to // ignore the library, but for users with specific needs diff --git a/server/actor/server/webSocket.go b/server/actor/server/webSocket.go index fc1fd18..dbe3a6d 100644 --- a/server/actor/server/webSocket.go +++ b/server/actor/server/webSocket.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/EtixLabs/cameradar/server/adaptor" + "github.com/Ullaakut/cameradar/server/adaptor" ) // WebSocket manages server communication using a websocket adaptor diff --git a/server/adaptor/jsonrpc2/jsonrpc2.go b/server/adaptor/jsonrpc2/jsonrpc2.go index 1774992..e5097dc 100644 --- a/server/adaptor/jsonrpc2/jsonrpc2.go +++ b/server/adaptor/jsonrpc2/jsonrpc2.go @@ -1,6 +1,6 @@ package jsonrpc2 -import "github.com/EtixLabs/cameradar" +import "github.com/Ullaakut/cameradar" // http://www.jsonrpc.org/specification const ( diff --git a/server/adaptor/websocket/factoryMock.go b/server/adaptor/websocket/factoryMock.go index 8ce5c6d..40841e6 100644 --- a/server/adaptor/websocket/factoryMock.go +++ b/server/adaptor/websocket/factoryMock.go @@ -3,7 +3,7 @@ package websocket import ( "net/http" - "github.com/EtixLabs/cameradar/server/adaptor" + "github.com/Ullaakut/cameradar/server/adaptor" "github.com/stretchr/testify/mock" ) diff --git a/server/adaptor/websocket/gorillaFactory.go b/server/adaptor/websocket/gorillaFactory.go index 2504fc7..f6dbe83 100644 --- a/server/adaptor/websocket/gorillaFactory.go +++ b/server/adaptor/websocket/gorillaFactory.go @@ -5,7 +5,7 @@ import ( "net/http" "time" - "github.com/EtixLabs/cameradar/server/adaptor" + "github.com/Ullaakut/cameradar/server/adaptor" gorilla "github.com/gorilla/websocket" "github.com/pkg/errors" diff --git a/server/main.go b/server/main.go index 604f7d8..4fa9c4a 100644 --- a/server/main.go +++ b/server/main.go @@ -5,9 +5,9 @@ import ( "net/http" "os" - "github.com/EtixLabs/cameradar/server/actor/server" - "github.com/EtixLabs/cameradar/server/adaptor/websocket" - "github.com/EtixLabs/cameradar/server/service" + "github.com/Ullaakut/cameradar/server/actor/server" + "github.com/Ullaakut/cameradar/server/adaptor/websocket" + "github.com/Ullaakut/cameradar/server/service" graceful "gopkg.in/tylerb/graceful.v1" ) @@ -19,8 +19,8 @@ func main() { server := server.New(webSocketFactory, fromClient, toClient) _, err := service.New( - "/Users/ullaakut/Work/go/src/github.com/EtixLabs/cameradar/dictionaries/routes", - "/Users/ullaakut/Work/go/src/github.com/EtixLabs/cameradar/dictionaries/credentials.json", + "/Users/ullaakut/Work/go/src/github.com/Ullaakut/cameradar/dictionaries/routes", + "/Users/ullaakut/Work/go/src/github.com/Ullaakut/cameradar/dictionaries/credentials.json", fromClient, toClient, ) diff --git a/server/service/handler.go b/server/service/handler.go index b523f4a..0b4cab7 100644 --- a/server/service/handler.go +++ b/server/service/handler.go @@ -4,8 +4,8 @@ import ( "encoding/json" "fmt" - "github.com/EtixLabs/cameradar" - "github.com/EtixLabs/cameradar/server/adaptor/jsonrpc2" + "github.com/Ullaakut/cameradar" + "github.com/Ullaakut/cameradar/server/adaptor/jsonrpc2" v "gopkg.in/go-playground/validator.v9" ) diff --git a/server/service/service.go b/server/service/service.go index 88d4746..fe083e1 100644 --- a/server/service/service.go +++ b/server/service/service.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/EtixLabs/cameradar" + "github.com/Ullaakut/cameradar" "github.com/pkg/errors" )