recog 1.0.10 → 1.0.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 4c0a664d63aaf4f4e21495af1bb5b9f9fdd1288b
4
- data.tar.gz: 8722579af2ab431ae3daee15f18215c6daa11c31
3
+ metadata.gz: 73a7056d5f4ac17ab0cc7b504bf9db0055f6a62c
4
+ data.tar.gz: f390a10a9c915d60ec6b1c3ef9b30b5b446163d1
5
5
  SHA512:
6
- metadata.gz: c954a0f4fbf3ca03eb92b4b93ae1169515a341967b2a8469711330d82a2e5c0b2e560c54a18a95cc6c56ebefbeacda3c46bf2870800e04149c1325232f5bbafc
7
- data.tar.gz: 550a950abb19fb5effa42981ab32bf63e107aba3b49020c3e1ef181988b431988fc1bbf113e496b0a305bb827a6ef9d29971ce9eaba3bb5b29bbcd11458c2e31
6
+ metadata.gz: b2f5cb872f1149451100f9b22298491af23dcfd41f21f877d4c3c1bc1af18331b7947778bb8548c25a902f0598418ca53f522d163b3d05c6d7b32e01d6a79e9f
7
+ data.tar.gz: 9cfdd14324588db594181ad36c304aa63fed15a84fde022055967b054d1e660970ebb35849a7551561723c2bdaac4b3e398a989f2d3ef25a7cb691526a058ee2
data/CONTRIBUTING.md CHANGED
@@ -5,7 +5,7 @@ you can make to the project. These contributions typically come in the form of
5
5
  filed bugs/issues or pull requests (PRs). These contributions routinely result
6
6
  in new versions of the [recog gem](https://rubygems.org/gems/recog) and the
7
7
  [recog release](https://github.com/rapid7/recog/releases) to be released. The
8
- process for each is outlined below.
8
+ process for everything is described below.
9
9
 
10
10
  ## Contributing Issues / Bug Reports
11
11
 
@@ -73,19 +73,57 @@ git push origin FOO
73
73
 
74
74
  Finally, submit the PR. Navigate to ```https://github.com/<your-github-username>/recog/compare/FOO```, fill in the details and submit.
75
75
 
76
+ ## Landing PRs
77
+
78
+ (Note: this portion is a work-in-progress. Please update it as things change)
79
+
80
+ Much like with the process of submitting PRs, Recog's process for landing PRs
81
+ is very similar to [Metasploit's process for landing
82
+ PRs](https://github.com/rapid7/metasploit-framework/wiki/Landing-Pull-Requests).
83
+ In short:
84
+
85
+ 1. Follow the "Fork and Clone" steps from above
86
+ 2. Fetch the latest revisions:
87
+
88
+ ```
89
+ git fetch --all
90
+ ```
91
+
92
+ 3. Checkout and branch the PR for testing. Replace ```PR``` below with the actual PR # in question:
93
+
94
+ ```
95
+ git checkout -b landing-PR upstream/pr/PR
96
+ ```
97
+
98
+ 4. Test the PR, which typically involves running ```rspec```.
99
+ 5. Merge with master, re-test, validate and push:
100
+
101
+ ```
102
+ git checkout -b upstream-master --track upstream/master
103
+ git merge -S --no-ff --edit landing-PR
104
+ git push upstream upstream-master:master --dry-run # confirm you are pushing what you expect
105
+ git push upstream upstream-master:master
106
+ ```
107
+
76
108
  ## Releasing New Versions
77
109
 
78
- Typically this process is reserved for contributors with push permissions to Recog:
110
+ When Recog's critical parts are modified, for example its fingerprints or
111
+ underlying supporting code, a new version should eventually be released. These
112
+ new releases can then be optionally included in projects such as Metasploit or
113
+ products such as Rapid7's in a controlled manner.
114
+
115
+ For now, in general any time Recog is modified you should release a version of
116
+ the Gem and the Github release, described below. Eventually this process may
117
+ change.
79
118
 
80
119
  ### Release New Gem
81
120
 
82
121
  1. Get an account on [Rubygems](https://rubygems.org)
83
- 2. Contact one of the Recog project contributors and have them add you to the Recog gem. They'll need to run:
84
- ```
85
- gem owner recog -a EMAIL
86
- ```
87
- Where ```EMAIL``` is the email address you registered on Rubygems.
88
- 3. Edit [lib/recog/version.rb](https://github.com/rapid7/recog/blob/master/lib/recog/version.rb) and increment ```VERSION```. Commit and push to origin/upstream master.
122
+ 2. Contact one of the Recog project contributors (listed [here under OWNERS](https://rubygems.org/gems/recog) and have them add you to the Recog gem. They'll need to run:
123
+ ```
124
+ gem owner recog -a EMAIL
125
+ ```
126
+ 3. Edit [lib/recog/version.rb](https://github.com/rapid7/recog/blob/master/lib/recog/version.rb) and increment ```VERSION```. Commit and push to rapid7/recog master.
89
127
  4. Run ```rake release```
90
128
 
91
129
  ### Github Release
data/lib/recog/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Recog
2
- VERSION = '1.0.10'
2
+ VERSION = '1.0.11'
3
3
  end
data/xml/http_servers.xml CHANGED
@@ -2996,6 +2996,26 @@
2996
2996
  <param pos="1" name="service.version"/>
2997
2997
  </fingerprint>
2998
2998
 
2999
+ <fingerprint pattern="^TornadoServer/((?:\d+\.)*\d+)$" flags="REG_ICASE">
3000
+ <example>TornadoServer/4.0.2</example>
3001
+ <description>Tornado Python web framework and asynchronous networking library.</description>
3002
+ <param pos="0" name="service.vendor" value="Tornado"/>
3003
+ <param pos="0" name="service.product" value="Tornado"/>
3004
+ <param pos="0" name="service.family" value="Tornado"/>
3005
+ <param pos="1" name="service.version"/>
3006
+ </fingerprint>
3007
+
3008
+ <fingerprint pattern="^SimpleHTTP/((?:\d+\.)*\d+)\s*Python/((?:\d+\.)*\d+)$" flags="REG_ICASE">
3009
+ <example>SimpleHTTP/0.6 Python/2.7.6</example>
3010
+ <example>SimpleHTTP/0.6 Python/3.4.0</example>
3011
+ <description>SimpleHTTPRequestHandler Python class is a simple HTTP request handler.</description>
3012
+ <param pos="0" name="service.vendor" value="Python Software Foundation"/>
3013
+ <param pos="0" name="service.product" value="SimpleHTTP"/>
3014
+ <param pos="0" name="service.family" value="Python"/>
3015
+ <param pos="1" name="service.version"/>
3016
+ <param pos="2" name="python.version"/>
3017
+ </fingerprint>
3018
+
2999
3019
  <fingerprint pattern="^HP Web Jetadmin/((?:\d+\.)+\d+)\s*(.*)$">
3000
3020
  <example>HP Web Jetadmin/2.0.50 (Win32) mod_auth_sspi/1.0.1 mod_ssl/2.0.50 OpenSSL/0.9.6m</example>
3001
3021
  <description>Apache variant for web access to HP printers.</description>
metadata CHANGED
@@ -1,111 +1,111 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: recog
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.10
4
+ version: 1.0.11
5
5
  platform: ruby
6
6
  authors:
7
7
  - Rapid7 Research
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-01-26 00:00:00.000000000 Z
11
+ date: 2015-01-29 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rspec
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - '>='
17
+ - - ">="
18
18
  - !ruby/object:Gem::Version
19
19
  version: '0'
20
20
  type: :development
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - '>='
24
+ - - ">="
25
25
  - !ruby/object:Gem::Version
26
26
  version: '0'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: yard
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - '>='
31
+ - - ">="
32
32
  - !ruby/object:Gem::Version
33
33
  version: '0'
34
34
  type: :development
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - '>='
38
+ - - ">="
39
39
  - !ruby/object:Gem::Version
40
40
  version: '0'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: redcarpet
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - '>='
45
+ - - ">="
46
46
  - !ruby/object:Gem::Version
47
47
  version: '0'
48
48
  type: :development
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - '>='
52
+ - - ">="
53
53
  - !ruby/object:Gem::Version
54
54
  version: '0'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: cucumber
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - '>='
59
+ - - ">="
60
60
  - !ruby/object:Gem::Version
61
61
  version: '0'
62
62
  type: :development
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - '>='
66
+ - - ">="
67
67
  - !ruby/object:Gem::Version
68
68
  version: '0'
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: aruba
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - '>='
73
+ - - ">="
74
74
  - !ruby/object:Gem::Version
75
75
  version: '0'
76
76
  type: :development
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - '>='
80
+ - - ">="
81
81
  - !ruby/object:Gem::Version
82
82
  version: '0'
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: simplecov
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - '>='
87
+ - - ">="
88
88
  - !ruby/object:Gem::Version
89
89
  version: '0'
90
90
  type: :development
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - '>='
94
+ - - ">="
95
95
  - !ruby/object:Gem::Version
96
96
  version: '0'
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: nokogiri
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - '>='
101
+ - - ">="
102
102
  - !ruby/object:Gem::Version
103
103
  version: '0'
104
104
  type: :runtime
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - '>='
108
+ - - ">="
109
109
  - !ruby/object:Gem::Version
110
110
  version: '0'
111
111
  description: Recog is a framework for identifying products, services, operating systems,
@@ -121,10 +121,10 @@ executables:
121
121
  extensions: []
122
122
  extra_rdoc_files: []
123
123
  files:
124
- - .gitignore
125
- - .rspec
126
- - .travis.yml
127
- - .yardopts
124
+ - ".gitignore"
125
+ - ".rspec"
126
+ - ".travis.yml"
127
+ - ".yardopts"
128
128
  - CONTRIBUTING.md
129
129
  - Gemfile
130
130
  - LICENSE
@@ -215,17 +215,17 @@ require_paths:
215
215
  - lib
216
216
  required_ruby_version: !ruby/object:Gem::Requirement
217
217
  requirements:
218
- - - '>='
218
+ - - ">="
219
219
  - !ruby/object:Gem::Version
220
220
  version: '0'
221
221
  required_rubygems_version: !ruby/object:Gem::Requirement
222
222
  requirements:
223
- - - '>='
223
+ - - ">="
224
224
  - !ruby/object:Gem::Version
225
225
  version: '0'
226
226
  requirements: []
227
227
  rubyforge_project:
228
- rubygems_version: 2.2.2
228
+ rubygems_version: 2.4.3
229
229
  signing_key:
230
230
  specification_version: 4
231
231
  summary: Network service fingerprint database, classes, and utilities