From 8634ba84cacd4e6c48f1839a67b6c04423bb222a Mon Sep 17 00:00:00 2001 From: Brendan Le Glaunec Date: Thu, 3 Oct 2019 22:04:17 +0200 Subject: [PATCH] Update dictionaries & dependencies for dictionary fetch tool (#240) --- dictionaries/credentials.json | 9 ++++- dictionaries/routes | 71 +++++++++++++++++++++-------------- go.mod | 4 ++ go.sum | 19 ++++++++++ 4 files changed, 74 insertions(+), 29 deletions(-) diff --git a/dictionaries/credentials.json b/dictionaries/credentials.json index fbacd75..a1413e4 100644 --- a/dictionaries/credentials.json +++ b/dictionaries/credentials.json @@ -22,24 +22,31 @@ "1234", "12345", "123456", + "12345678", "4321", "666666", "888888", "9999", "admin", + "administrator", "aiphone", "camera", "fliradmin", + "hikvision", + "hikadmin", "ikwd", "jvc", "meinsm", "pass", "password", + "reolink", "root", "service", "supervisor", "system", + "toor", + "tp-link", "ubnt", "wbox123" ] -} \ No newline at end of file +} diff --git a/dictionaries/routes b/dictionaries/routes index 7b4aa6e..375982a 100644 --- a/dictionaries/routes +++ b/dictionaries/routes @@ -1,4 +1,5 @@ +/live/ch01_0 0/1:1/main 0/usrnm:pwd/main 0/video1 @@ -9,7 +10,29 @@ 11 12 125 +1080p +1440p +480p +4K 666 +720p +AVStream1_1 +CAM_ID.password.mp2 +CH001.sdp +GetData.cgi +HD +HighResolutionVideo +LowResolutionVideo +MediaInput/h264 +MediaInput/mpeg4 +ONVIF/MediaInput +ONVIF/MediaInput?profile=4_def_profile6 +StdCh1 +Streaming/Channels/1 +Streaming/Unicast/channels/101 +StreamingSetting?version=1.0&action=getRTSPStream&ChannelID=1&ChannelName=Channel1 +VideoInput/1/h264/1 +VideoInput/1/mpeg4/1 access_code access_name_for_stream_1_to_5 api/mjpegvideo.cgi @@ -17,18 +40,19 @@ av0_0 av2 avc avn=2 -AVStream1_1 axis-media/media.amp axis-media/media.amp?camera=1 axis-media/media.amp?videocodec=h264 cam -CAM_ID.password.mp2 cam/realmonitor cam/realmonitor?channel=0&subtype=0 cam/realmonitor?channel=1&subtype=0 +cam/realmonitor?channel=1&subtype=1 cam/realmonitor?channel=1&subtype=1&unicast=true&proto=Onvif +cam0 cam0_0 cam0_1 +cam1 cam1/h264 cam1/h264/multicast cam1/mjpeg @@ -37,39 +61,34 @@ cam1/mpeg4?user='username'&pwd='password' cam1/onvif-h264 camera.stm ch0 -ch0_0.h264 -ch0_unicast_firststream -ch0_unicast_secondstream ch00/0 ch001.sdp -CH001.sdp ch01.264 ch01.264? ch01.264?ptype=tcp +ch0_0.h264 +ch0_unicast_firststream +ch0_unicast_secondstream ch1-s1 channel1 -GetData.cgi gnz_media/main h264 -h264_vga.sdp h264.sdp h264/ch1/sub/av_stream h264/media.amp h264Preview_01_main h264Preview_01_sub -HighResolutionVideo +h264_vga.sdp image.mpg img/media.sav img/media.sav?channel=1 img/video.asf img/video.sav ioImage/1 +ipcam.sdp ipcam_h264.sdp ipcam_mjpeg.sdp -ipcam.sdp live -live_mpeg4.sdp -live_st1 live.sdp live/av0 live/ch0 @@ -81,16 +100,15 @@ live/main0 live/mpeg4 live1.sdp live3.sdp +live_mpeg4.sdp +live_st1 livestream -LowResolutionVideo main media media.amp media.amp?streamprofile=Profile1 media/media.amp media/video1 -MediaInput/h264 -MediaInput/mpeg4 medias2 mjpeg/media.smp mp4 @@ -109,8 +127,6 @@ nphMpeg4/g726-640x48 nphMpeg4/g726-640x480 nphMpeg4/nil-320x240 onvif-media/media.amp -ONVIF/MediaInput -ONVIF/MediaInput?profile=4_def_profile6 onvif1 pass@10.0.0.5:6667/blinkhd play1.sdp @@ -124,16 +140,15 @@ rtsp_live2 rtsp_tunnel rtsph264 rtsph2641080p -StdCh1 stream +stream/0 +stream/1 +stream/live.sdp stream.sdp stream1 streaming/channels/0 -Streaming/Channels/1 streaming/channels/1 streaming/channels/101 -Streaming/Unicast/channels/101 -StreamingSetting?version=1.0&action=getRTSPStream&ChannelID=1&ChannelName=Channel1 tcp/av0_0 test trackID=1 @@ -141,12 +156,12 @@ ucast/11 udp/av0_0 udp/unicast/aiphone_H264 udpstream -user_defined user.pin.mp2 -user=admin_password=?????_channel=1_stream=0.sdp?real_stream -user=admin_password=R5XFY888_channel=1_stream=0.sdp?real_stream user=admin&password=&channel=1&stream=0.sdp? user=admin&password=&channel=1&stream=0.sdp?real_stream +user=admin_password=?????_channel=1_stream=0.sdp?real_stream +user=admin_password=R5XFY888_channel=1_stream=0.sdp?real_stream +user_defined v2 video video.3gp @@ -156,12 +171,12 @@ video.mp4 video.pro1 video.pro2 video.pro3 +video0 video0.sdp video1 +video1.sdp video1+audio1 -videoinput_1/h264_1/media.stm -VideoInput/1/h264/1 -VideoInput/1/mpeg4/1 videoMain +videoinput_1/h264_1/media.stm vis -wfov \ No newline at end of file +wfov diff --git a/go.mod b/go.mod index bd96715..2956d2a 100644 --- a/go.mod +++ b/go.mod @@ -3,11 +3,15 @@ module github.com/ullaakut/cameradar go 1.12 require ( + github.com/PuerkitoBio/goquery v1.5.0 + github.com/VividCortex/ewma v1.1.1 // indirect github.com/fatih/color v1.7.0 // indirect github.com/mattn/go-colorable v0.1.2 // indirect github.com/spf13/pflag v1.0.3 github.com/spf13/viper v1.4.0 + github.com/stretchr/testify v1.2.2 github.com/ullaakut/disgo v0.3.0 github.com/ullaakut/go-curl v0.0.0-20190525093431-597e157bbffd github.com/ullaakut/nmap v0.0.0-20190623040344-bb4f2791e14a + github.com/vbauerster/mpb v3.4.0+incompatible ) diff --git a/go.sum b/go.sum index 9ac4215..139f72a 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,15 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/PuerkitoBio/goquery v1.5.0 h1:uGvmFXOA73IKluu/F84Xd1tt/z07GYm8X49XKHP7EJk= +github.com/PuerkitoBio/goquery v1.5.0/go.mod h1:qD2PgZ9lccMbQlc7eEOjaeRlFQON7xY8kdmcsrnKqMg= +github.com/VividCortex/ewma v1.1.1 h1:MnEK4VOv6n0RSY4vtRe3h11qjxL3+t0B8yOL8iMXdcM= +github.com/VividCortex/ewma v1.1.1/go.mod h1:2Tkkvm3sRDVXaiyucHiACn4cqf7DpdyLvmxzcbUokwA= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/andybalholm/cascadia v1.0.0 h1:hOCXnnZ5A+3eVDX8pvgl4kofXv2ELss0bKcqRySc45o= +github.com/andybalholm/cascadia v1.0.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= @@ -13,6 +20,7 @@ github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +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/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= @@ -46,8 +54,10 @@ github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvW github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= @@ -63,6 +73,7 @@ github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +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/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= @@ -87,7 +98,9 @@ github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/viper v1.4.0 h1:yXHLWeravcrgGyFSyCgdYpXQ9dR9c/WED3pg1RhxqEU= github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= +github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= @@ -97,6 +110,8 @@ github.com/ullaakut/go-curl v0.0.0-20190525093431-597e157bbffd h1:IzJ7V8S7/NXc4a github.com/ullaakut/go-curl v0.0.0-20190525093431-597e157bbffd/go.mod h1:FTfXm4jC9Ff1yqc3/HMXCyr+SGO03vJyijJCQlNyF10= github.com/ullaakut/nmap v0.0.0-20190623040344-bb4f2791e14a h1:Q49G/c/ubeAPvrGGMPM0vt13gFDT5RwC6D0yOYsSjBs= github.com/ullaakut/nmap v0.0.0-20190623040344-bb4f2791e14a/go.mod h1:4CQy4PqZA4Snk3+MS26+1oAkJ8dCY8kGH6+kF42yajw= +github.com/vbauerster/mpb v3.4.0+incompatible h1:mfiiYw87ARaeRW6x5gWwYRUawxaW1tLAD8IceomUCNw= +github.com/vbauerster/mpb v3.4.0+incompatible/go.mod h1:zAHG26FUhVKETRu+MWqYXcI70POlC6N8up9p1dID7SU= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= @@ -104,13 +119,16 @@ go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190522155817-f3200d17e092 h1:4QSRKanuywn15aTZvI/mIDEgPQpswuFndXpOj3rKEco= golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -136,6 +154,7 @@ google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZi google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=