freewifi 0.2.4 → 0.2.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (35) hide show
  1. checksums.yaml +4 -4
  2. data/.gitignore +0 -0
  3. data/.idea/freewifi.iml +57 -0
  4. data/.idea/inspectionProfiles/Project_Default.xml +0 -0
  5. data/.idea/misc.xml +0 -0
  6. data/.idea/modules.xml +0 -0
  7. data/.idea/runConfigurations/get_iwag_data.xml +0 -0
  8. data/.idea/vcs.xml +0 -0
  9. data/.idea/workspace.xml +141 -132
  10. data/.travis.yml +0 -0
  11. data/CODE_OF_CONDUCT.md +0 -0
  12. data/Gemfile +0 -0
  13. data/LICENSE.txt +0 -0
  14. data/README.md +0 -0
  15. data/Rakefile +0 -0
  16. data/freewifi.gemspec +0 -0
  17. data/lib/freewifi/additional/additional_functions.rb +1 -1
  18. data/lib/freewifi/cisco/any/cisco_schemes_conf_gen.rb +0 -0
  19. data/lib/freewifi/cisco/iwag/get_iwag_data.rb +0 -0
  20. data/lib/freewifi/cisco/iwag/iwag_database_worker.rb +0 -0
  21. data/lib/freewifi/cisco/iwag/iwag_telnet_connector.rb +0 -0
  22. data/lib/freewifi/config.rb +0 -0
  23. data/lib/freewifi/database/mongo/mongoconnector.rb +0 -0
  24. data/lib/freewifi/database/mysql/database_methods_wifi.rb +0 -0
  25. data/lib/freewifi/general/wifi_portal_procedures.rb +69 -53
  26. data/lib/freewifi/huawei/hua_controller_class.rb +0 -0
  27. data/lib/freewifi/mikrotik/automation/get_data_ssh_fun.rb +0 -0
  28. data/lib/freewifi/mikrotik/getsubscribermikrotik.rb +0 -0
  29. data/lib/freewifi/mikrotik/newhub_mtik_api.rb +172 -74
  30. data/lib/freewifi/mikrotik/newhub_mtik_ssh.rb +0 -0
  31. data/lib/freewifi/mikrotik/schemes_conf_gen.rb +0 -0
  32. data/lib/freewifi/params.rb +0 -0
  33. data/lib/freewifi/version.rb +1 -1
  34. data/lib/freewifi.rb +6 -2
  35. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 04aa565effe9e910c64f32c7721d394a7f8c08b8
4
- data.tar.gz: b991a95c72cc3313c96ccd8354fc069a5f921201
3
+ metadata.gz: 1e88839a32787d9fb291a6729bf956474a409b15
4
+ data.tar.gz: e68f96f0705379d572324642e32eea27c2ff9980
5
5
  SHA512:
6
- metadata.gz: ea020736c3880f59123c516fe6f6f94139f1865fb91d373de6069b24b0fa63151b5b78b706066556a65e2bcae746d5de41b6cc1772c4b08eab5068a4661aea89
7
- data.tar.gz: 9293a16aa70c434dea568a44d5c623ca41c250d2407ac75f789f1291b40918a99db16559f51de51e869b7721f77d7d0cc2877274f42cfa9485332b7002b3a642
6
+ metadata.gz: 802e1593161a7e1a92d4a8bb5b67263dbeef22aa9b914aa758cf4375b2e76e85060d1d9fef92e801ea20c8ad801e0fa9fe860ea7035c8431005e5a4086d9007e
7
+ data.tar.gz: 3f9574ba171e099c6878752eafefe1641928cf8d311666a11d7c11a2b2f009cf91d986a530ac1c2c02f71f1a05f4699e686ebc5082dee651d6a542f1eeb15c0f
data/.gitignore CHANGED
File without changes
data/.idea/freewifi.iml CHANGED
@@ -134,6 +134,63 @@
134
134
  <RUBY_RUN_CONFIG NAME="SCRIPT_ARGS" VALUE="" />
135
135
  <method />
136
136
  </configuration>
137
+ <configuration default="false" name="test2" type="RubyRunConfigurationType" factoryName="Ruby">
138
+ <module name="freewifi" />
139
+ <RUBY_RUN_CONFIG NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
140
+ <RUBY_RUN_CONFIG NAME="WORK DIR" VALUE="$MODULE_DIR$/test" />
141
+ <RUBY_RUN_CONFIG NAME="SHOULD_USE_SDK" VALUE="false" />
142
+ <RUBY_RUN_CONFIG NAME="ALTERN_SDK_NAME" VALUE="" />
143
+ <RUBY_RUN_CONFIG NAME="myPassParentEnvs" VALUE="true" />
144
+ <envs />
145
+ <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="true" />
146
+ <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
147
+ <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">
148
+ <COVERAGE_PATTERN ENABLED="true">
149
+ <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
150
+ </COVERAGE_PATTERN>
151
+ </EXTENSION>
152
+ <RUBY_RUN_CONFIG NAME="SCRIPT_PATH" VALUE="$MODULE_DIR$/test/test2.rb" />
153
+ <RUBY_RUN_CONFIG NAME="SCRIPT_ARGS" VALUE="" />
154
+ <method />
155
+ </configuration>
156
+ <configuration default="false" name="ssh_mtik_1" type="RubyRunConfigurationType" factoryName="Ruby">
157
+ <module name="freewifi" />
158
+ <RUBY_RUN_CONFIG NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
159
+ <RUBY_RUN_CONFIG NAME="WORK DIR" VALUE="$MODULE_DIR$/test" />
160
+ <RUBY_RUN_CONFIG NAME="SHOULD_USE_SDK" VALUE="false" />
161
+ <RUBY_RUN_CONFIG NAME="ALTERN_SDK_NAME" VALUE="" />
162
+ <RUBY_RUN_CONFIG NAME="myPassParentEnvs" VALUE="true" />
163
+ <envs />
164
+ <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="true" />
165
+ <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
166
+ <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">
167
+ <COVERAGE_PATTERN ENABLED="true">
168
+ <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
169
+ </COVERAGE_PATTERN>
170
+ </EXTENSION>
171
+ <RUBY_RUN_CONFIG NAME="SCRIPT_PATH" VALUE="$MODULE_DIR$/test/ssh_mtik_1.rb" />
172
+ <RUBY_RUN_CONFIG NAME="SCRIPT_ARGS" VALUE="" />
173
+ <method />
174
+ </configuration>
175
+ <configuration default="false" name="ssh_mtik_2" type="RubyRunConfigurationType" factoryName="Ruby">
176
+ <module name="freewifi" />
177
+ <RUBY_RUN_CONFIG NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
178
+ <RUBY_RUN_CONFIG NAME="WORK DIR" VALUE="$MODULE_DIR$/test" />
179
+ <RUBY_RUN_CONFIG NAME="SHOULD_USE_SDK" VALUE="false" />
180
+ <RUBY_RUN_CONFIG NAME="ALTERN_SDK_NAME" VALUE="" />
181
+ <RUBY_RUN_CONFIG NAME="myPassParentEnvs" VALUE="true" />
182
+ <envs />
183
+ <EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="true" />
184
+ <EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
185
+ <EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">
186
+ <COVERAGE_PATTERN ENABLED="true">
187
+ <PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
188
+ </COVERAGE_PATTERN>
189
+ </EXTENSION>
190
+ <RUBY_RUN_CONFIG NAME="SCRIPT_PATH" VALUE="$MODULE_DIR$/test/ssh_mtik_2.rb" />
191
+ <RUBY_RUN_CONFIG NAME="SCRIPT_ARGS" VALUE="" />
192
+ <method />
193
+ </configuration>
137
194
  </component>
138
195
  <component name="NewModuleRootManager">
139
196
  <content url="file://$MODULE_DIR$" />
data/.idea/inspectionProfiles/Project_Default.xml CHANGED
File without changes
data/.idea/misc.xml CHANGED
File without changes
data/.idea/modules.xml CHANGED
File without changes
data/.idea/runConfigurations/get_iwag_data.xml CHANGED
File without changes
data/.idea/vcs.xml CHANGED
File without changes
data/.idea/workspace.xml CHANGED
@@ -41,6 +41,9 @@
41
41
  <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/lib/freewifi/params.rb" />
42
42
  <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/lib/freewifi/version.rb" />
43
43
  <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/freewifi_test.rb" />
44
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/ssh_mtik_1.rb" />
45
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/ssh_mtik_2.rb" />
46
+ <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/test2.rb" />
44
47
  <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/test/test_helper.rb" />
45
48
  </list>
46
49
  <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -53,81 +56,74 @@
53
56
  <component name="ChangesViewManager" flattened_view="false" />
54
57
  <component name="CoverageDataManager">
55
58
  <SUITE FILE_PATH="coverage/freewifi@additional_functions.coverage" NAME="additional_functions Coverage Results" MODIFIED="1588023723762" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/lib/freewifi/additional" MODULE_NAME="freewifi" />
59
+ <SUITE FILE_PATH="coverage/freewifi@ssh_mtik_2.coverage" NAME="ssh_mtik_2 Coverage Results" MODIFIED="1645285472334" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test" MODULE_NAME="freewifi" />
60
+ <SUITE FILE_PATH="coverage/freewifi@test2.coverage" NAME="test2 Coverage Results" MODIFIED="1617284278277" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test" MODULE_NAME="freewifi" />
56
61
  <SUITE FILE_PATH="coverage/freewifi@sql_delete_not_necc.coverage" NAME="sql_delete_not_necc Coverage Results" MODIFIED="1600631885005" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test" MODULE_NAME="freewifi" />
57
- <SUITE FILE_PATH="coverage/freewifi@test_helper.coverage" NAME="test_helper Coverage Results" MODIFIED="1609550235519" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test" MODULE_NAME="freewifi" />
62
+ <SUITE FILE_PATH="coverage/freewifi@test_helper.coverage" NAME="test_helper Coverage Results" MODIFIED="1630914623354" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test" MODULE_NAME="freewifi" />
58
63
  <SUITE FILE_PATH="coverage/freewifi@test.coverage" NAME="test Coverage Results" MODIFIED="1587924491650" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test" MODULE_NAME="freewifi" />
59
64
  <SUITE FILE_PATH="coverage/freewifi@wifi_portal_procedures.coverage" NAME="wifi_portal_procedures Coverage Results" MODIFIED="1588069407762" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/lib/freewifi/general" MODULE_NAME="freewifi" />
60
65
  <SUITE FILE_PATH="coverage/freewifi@get_iwag_data.coverage" NAME="get_iwag_data Coverage Results" MODIFIED="1600377682284" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/lib/freewifi/cisco/iwag" MODULE_NAME="freewifi" />
61
66
  <SUITE FILE_PATH="coverage/freewifi@hewhub_mtik_ssh.coverage" NAME="hewhub_mtik_ssh Coverage Results" MODIFIED="1587796347972" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/lib/freewifi/mikrotik" MODULE_NAME="freewifi" />
67
+ <SUITE FILE_PATH="coverage/freewifi@ssh_mtik_1.coverage" NAME="ssh_mtik_1 Coverage Results" MODIFIED="1645283687687" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test" MODULE_NAME="freewifi" />
62
68
  </component>
63
69
  <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
64
70
  <component name="FileEditorManager">
65
71
  <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
66
- <file leaf-file-name="freewifi.rb" pinned="false" current-in-tab="false">
67
- <entry file="file://$PROJECT_DIR$/lib/freewifi.rb">
68
- <provider selected="true" editor-type-id="text-editor">
69
- <state relative-caret-position="205">
70
- <caret line="251" column="7" lean-forward="true" selection-start-line="251" selection-start-column="7" selection-end-line="251" selection-end-column="7" />
71
- <folding />
72
- </state>
73
- </provider>
74
- </entry>
75
- </file>
76
72
  <file leaf-file-name="test_helper.rb" pinned="false" current-in-tab="false">
77
73
  <entry file="file://$PROJECT_DIR$/test/test_helper.rb">
78
74
  <provider selected="true" editor-type-id="text-editor">
79
- <state relative-caret-position="145">
80
- <caret line="25" column="18" lean-forward="false" selection-start-line="25" selection-start-column="18" selection-end-line="25" selection-end-column="18" />
75
+ <state relative-caret-position="1155">
76
+ <caret line="77" column="1" lean-forward="false" selection-start-line="77" selection-start-column="1" selection-end-line="77" selection-end-column="1" />
81
77
  <folding />
82
78
  </state>
83
79
  </provider>
84
80
  </entry>
85
81
  </file>
86
- <file leaf-file-name="wifi_portal_procedures.rb" pinned="false" current-in-tab="false">
82
+ <file leaf-file-name="wifi_portal_procedures.rb" pinned="false" current-in-tab="true">
87
83
  <entry file="file://$PROJECT_DIR$/lib/freewifi/general/wifi_portal_procedures.rb">
88
84
  <provider selected="true" editor-type-id="text-editor">
89
- <state relative-caret-position="145">
90
- <caret line="127" column="100" lean-forward="false" selection-start-line="127" selection-start-column="100" selection-end-line="127" selection-end-column="100" />
85
+ <state relative-caret-position="104">
86
+ <caret line="260" column="36" lean-forward="false" selection-start-line="260" selection-start-column="36" selection-end-line="260" selection-end-column="36" />
91
87
  <folding />
92
88
  </state>
93
89
  </provider>
94
90
  </entry>
95
91
  </file>
96
- <file leaf-file-name="iwag_telnet_connector.rb" pinned="false" current-in-tab="false">
97
- <entry file="file://$PROJECT_DIR$/lib/freewifi/cisco/iwag/iwag_telnet_connector.rb">
92
+ <file leaf-file-name="ssh_mtik_2.rb" pinned="false" current-in-tab="false">
93
+ <entry file="file://$PROJECT_DIR$/test/ssh_mtik_2.rb">
98
94
  <provider selected="true" editor-type-id="text-editor">
99
- <state relative-caret-position="145">
100
- <caret line="89" column="93" lean-forward="false" selection-start-line="89" selection-start-column="93" selection-end-line="89" selection-end-column="93" />
95
+ <state relative-caret-position="1410">
96
+ <caret line="94" column="4" lean-forward="true" selection-start-line="94" selection-start-column="4" selection-end-line="94" selection-end-column="4" />
101
97
  <folding />
102
98
  </state>
103
99
  </provider>
104
100
  </entry>
105
101
  </file>
106
- <file leaf-file-name="newhub_mtik_api.rb" pinned="false" current-in-tab="false">
107
- <entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/newhub_mtik_api.rb">
102
+ <file leaf-file-name="version.rb" pinned="false" current-in-tab="false">
103
+ <entry file="file://$PROJECT_DIR$/lib/freewifi/version.rb">
108
104
  <provider selected="true" editor-type-id="text-editor">
109
- <state relative-caret-position="731">
110
- <caret line="93" column="0" lean-forward="false" selection-start-line="93" selection-start-column="0" selection-end-line="93" selection-end-column="0" />
105
+ <state relative-caret-position="45">
106
+ <caret line="3" column="0" lean-forward="true" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
111
107
  <folding />
112
108
  </state>
113
109
  </provider>
114
110
  </entry>
115
111
  </file>
116
- <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
117
- <entry file="file://$PROJECT_DIR$/lib/freewifi/version.rb">
112
+ <file leaf-file-name="newhub_mtik_api.rb" pinned="false" current-in-tab="false">
113
+ <entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/newhub_mtik_api.rb">
118
114
  <provider selected="true" editor-type-id="text-editor">
119
- <state relative-caret-position="45">
120
- <caret line="3" column="0" lean-forward="false" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
115
+ <state relative-caret-position="-871">
116
+ <caret line="21" column="20" lean-forward="true" selection-start-line="21" selection-start-column="20" selection-end-line="21" selection-end-column="20" />
121
117
  <folding />
122
118
  </state>
123
119
  </provider>
124
120
  </entry>
125
121
  </file>
126
- <file leaf-file-name="config.rb" pinned="false" current-in-tab="false">
127
- <entry file="file://$PROJECT_DIR$/lib/freewifi/config.rb">
122
+ <file leaf-file-name="freewifi.rb" pinned="false" current-in-tab="false">
123
+ <entry file="file://$PROJECT_DIR$/lib/freewifi.rb">
128
124
  <provider selected="true" editor-type-id="text-editor">
129
- <state relative-caret-position="15">
130
- <caret line="1" column="22" lean-forward="false" selection-start-line="1" selection-start-column="22" selection-end-line="1" selection-end-column="22" />
125
+ <state relative-caret-position="-633">
126
+ <caret line="306" column="25" lean-forward="false" selection-start-line="306" selection-start-column="25" selection-end-line="306" selection-end-column="25" />
131
127
  <folding />
132
128
  </state>
133
129
  </provider>
@@ -136,8 +132,8 @@
136
132
  <file leaf-file-name="freewifi_test.rb" pinned="false" current-in-tab="false">
137
133
  <entry file="file://$PROJECT_DIR$/test/freewifi_test.rb">
138
134
  <provider selected="true" editor-type-id="text-editor">
139
- <state relative-caret-position="0">
140
- <caret line="0" column="21" lean-forward="false" selection-start-line="0" selection-start-column="21" selection-end-line="0" selection-end-column="21" />
135
+ <state relative-caret-position="165">
136
+ <caret line="11" column="0" lean-forward="false" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
141
137
  <folding />
142
138
  </state>
143
139
  </provider>
@@ -153,16 +149,6 @@
153
149
  </provider>
154
150
  </entry>
155
151
  </file>
156
- <file leaf-file-name="additional_functions.rb" pinned="false" current-in-tab="false">
157
- <entry file="file://$PROJECT_DIR$/lib/freewifi/additional/additional_functions.rb">
158
- <provider selected="true" editor-type-id="text-editor">
159
- <state relative-caret-position="30">
160
- <caret line="2" column="0" lean-forward="true" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
161
- <folding />
162
- </state>
163
- </provider>
164
- </entry>
165
- </file>
166
152
  </leaf>
167
153
  </component>
168
154
  <component name="Git.Settings">
@@ -186,19 +172,22 @@
186
172
  <option value="$PROJECT_DIR$/lib/freewifi/cisco/iwag/iwag_database_worker.rb" />
187
173
  <option value="$PROJECT_DIR$/lib/freewifi/cisco/iwag/get_iwag_data.rb" />
188
174
  <option value="$PROJECT_DIR$/test/sql_delete_not_necc.rb" />
189
- <option value="$PROJECT_DIR$/lib/freewifi/version.rb" />
190
175
  <option value="$PROJECT_DIR$/lib/freewifi/mikrotik/schemes_conf_gen.rb" />
191
176
  <option value="$PROJECT_DIR$/freewifi.gemspec" />
192
177
  <option value="$PROJECT_DIR$/Gemfile" />
193
178
  <option value="$PROJECT_DIR$/lib/freewifi/mikrotik/newhub_mtik_ssh.rb" />
194
- <option value="$PROJECT_DIR$/lib/freewifi/general/wifi_portal_procedures.rb" />
195
179
  <option value="$PROJECT_DIR$/lib/freewifi/cisco/iwag/iwag_telnet_connector.rb" />
196
180
  <option value="$PROJECT_DIR$/lib/freewifi/additional/additional_functions.rb" />
197
181
  <option value="$PROJECT_DIR$/lib/freewifi/config.rb" />
198
182
  <option value="$PROJECT_DIR$/test/freewifi_test.rb" />
183
+ <option value="$PROJECT_DIR$/test/test2.rb" />
184
+ <option value="$PROJECT_DIR$/test/test_helper.rb" />
185
+ <option value="$PROJECT_DIR$/test/ssh_mtik_1.rb" />
199
186
  <option value="$PROJECT_DIR$/lib/freewifi/mikrotik/newhub_mtik_api.rb" />
200
187
  <option value="$PROJECT_DIR$/lib/freewifi.rb" />
201
- <option value="$PROJECT_DIR$/test/test_helper.rb" />
188
+ <option value="$PROJECT_DIR$/test/ssh_mtik_2.rb" />
189
+ <option value="$PROJECT_DIR$/lib/freewifi/version.rb" />
190
+ <option value="$PROJECT_DIR$/lib/freewifi/general/wifi_portal_procedures.rb" />
202
191
  </list>
203
192
  </option>
204
193
  </component>
@@ -211,7 +200,7 @@
211
200
  <component name="ProjectFrameBounds">
212
201
  <option name="y" value="25" />
213
202
  <option name="width" value="1440" />
214
- <option name="height" value="817" />
203
+ <option name="height" value="834" />
215
204
  </component>
216
205
  <component name="ProjectView">
217
206
  <navigator currentView="ProjectPane" proportions="" version="1">
@@ -228,6 +217,8 @@
228
217
  <foldersAlwaysOnTop value="true" />
229
218
  </navigator>
230
219
  <panes>
220
+ <pane id="Scratches" />
221
+ <pane id="Scope" />
231
222
  <pane id="ProjectPane">
232
223
  <subPane>
233
224
  <PATH>
@@ -502,8 +493,6 @@
502
493
  </PATH>
503
494
  </subPane>
504
495
  </pane>
505
- <pane id="Scratches" />
506
- <pane id="Scope" />
507
496
  </panes>
508
497
  </component>
509
498
  <component name="PropertiesComponent">
@@ -531,7 +520,7 @@
531
520
  </list>
532
521
  </option>
533
522
  </component>
534
- <component name="RunManager" selected="Ruby.test_helper">
523
+ <component name="RunManager" selected="Ruby.ssh_mtik_2">
535
524
  <configuration default="true" type="CucumberRunConfigurationType" factoryName="Cucumber">
536
525
  <predefined_log_file id="RUBY_CUCUMBER" enabled="true" />
537
526
  <module name="" />
@@ -675,7 +664,7 @@
675
664
  <envs />
676
665
  <method />
677
666
  </configuration>
678
- <list size="7">
667
+ <list size="10">
679
668
  <item index="0" class="java.lang.String" itemvalue="Ruby.test_helper" />
680
669
  <item index="1" class="java.lang.String" itemvalue="Ruby.newhub_mtik_ssh" />
681
670
  <item index="2" class="java.lang.String" itemvalue="Ruby.test" />
@@ -683,7 +672,16 @@
683
672
  <item index="4" class="java.lang.String" itemvalue="Ruby.wifi_portal_procedures" />
684
673
  <item index="5" class="java.lang.String" itemvalue="Ruby.get_iwag_data" />
685
674
  <item index="6" class="java.lang.String" itemvalue="Ruby.sql_delete_not_necc" />
675
+ <item index="7" class="java.lang.String" itemvalue="Ruby.test2" />
676
+ <item index="8" class="java.lang.String" itemvalue="Ruby.ssh_mtik_1" />
677
+ <item index="9" class="java.lang.String" itemvalue="Ruby.ssh_mtik_2" />
686
678
  </list>
679
+ <recent_temporary>
680
+ <list size="2">
681
+ <item index="0" class="java.lang.String" itemvalue="Ruby.ssh_mtik_2" />
682
+ <item index="1" class="java.lang.String" itemvalue="Ruby.ssh_mtik_1" />
683
+ </list>
684
+ </recent_temporary>
687
685
  </component>
688
686
  <component name="ShelveChangesManager" show_recycled="false">
689
687
  <option name="remove_strategy" value="false" />
@@ -729,24 +727,46 @@
729
727
  <workItem from="1601137888490" duration="380000" />
730
728
  <workItem from="1609549885666" duration="1154000" />
731
729
  <workItem from="1609748280931" duration="1338000" />
732
- <workItem from="1609750498357" duration="1127000" />
730
+ <workItem from="1609750498357" duration="1143000" />
731
+ <workItem from="1616946258908" duration="566000" />
732
+ <workItem from="1617023644396" duration="596000" />
733
+ <workItem from="1617284139967" duration="713000" />
734
+ <workItem from="1618296653672" duration="598000" />
735
+ <workItem from="1618586569843" duration="566000" />
736
+ <workItem from="1619695676428" duration="532000" />
737
+ <workItem from="1620414183940" duration="486000" />
738
+ <workItem from="1621404752750" duration="103000" />
739
+ <workItem from="1621587590414" duration="431000" />
740
+ <workItem from="1622122382266" duration="597000" />
741
+ <workItem from="1624263972032" duration="80000" />
742
+ <workItem from="1624277311138" duration="116000" />
743
+ <workItem from="1624479991367" duration="2064000" />
744
+ <workItem from="1624483053639" duration="121000" />
745
+ <workItem from="1630913835964" duration="1620000" />
746
+ <workItem from="1630915490036" duration="1086000" />
747
+ <workItem from="1630917536392" duration="558000" />
748
+ <workItem from="1631795437227" duration="598000" />
749
+ <workItem from="1631798319666" duration="552000" />
750
+ <workItem from="1632223882664" duration="598000" />
751
+ <workItem from="1645283410222" duration="948000" />
752
+ <workItem from="1645284384865" duration="1679000" />
733
753
  </task>
734
754
  <servers />
735
755
  </component>
736
756
  <component name="TimeTrackingManager">
737
- <option name="totallyTimeSpent" value="109342000" />
757
+ <option name="totallyTimeSpent" value="124566000" />
738
758
  </component>
739
759
  <component name="ToolWindowManager">
740
- <frame x="0" y="25" width="1440" height="817" extended-state="0" />
760
+ <frame x="0" y="25" width="1440" height="834" extended-state="6" />
741
761
  <editor active="true" />
742
762
  <layout>
743
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.16666667" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
763
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22103004" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
744
764
  <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
745
765
  <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
746
- <window_info id="Inspection Results" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32900432" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
766
+ <window_info id="Inspection Results" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32816902" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
747
767
  <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
748
768
  <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.329602" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
749
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.35945272" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
769
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.35774648" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
750
770
  <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
751
771
  <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24964234" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
752
772
  <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -771,28 +791,6 @@
771
791
  <watches-manager />
772
792
  </component>
773
793
  <component name="editorHistoryManager">
774
- <entry file="file://$PROJECT_DIR$/freewifi.gemspec">
775
- <provider selected="true" editor-type-id="text-editor">
776
- <state relative-caret-position="405">
777
- <caret line="27" column="5" lean-forward="false" selection-start-line="27" selection-start-column="5" selection-end-line="27" selection-end-column="5" />
778
- </state>
779
- </provider>
780
- </entry>
781
- <entry file="file://$PROJECT_DIR$/lib/freewifi/version.rb">
782
- <provider selected="true" editor-type-id="text-editor">
783
- <state relative-caret-position="45">
784
- <caret line="3" column="0" lean-forward="false" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
785
- </state>
786
- </provider>
787
- </entry>
788
- <entry file="file://$PROJECT_DIR$/lib/freewifi.rb">
789
- <provider selected="true" editor-type-id="text-editor">
790
- <state relative-caret-position="150">
791
- <caret line="10" column="5" lean-forward="true" selection-start-line="10" selection-start-column="5" selection-end-line="10" selection-end-column="5" />
792
- <folding />
793
- </state>
794
- </provider>
795
- </entry>
796
794
  <entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/newhub_mtik_ssh.rb">
797
795
  <provider selected="true" editor-type-id="text-editor">
798
796
  <state relative-caret-position="360">
@@ -846,7 +844,6 @@
846
844
  <provider selected="true" editor-type-id="text-editor">
847
845
  <state relative-caret-position="150">
848
846
  <caret line="10" column="5" lean-forward="true" selection-start-line="10" selection-start-column="5" selection-end-line="10" selection-end-column="5" />
849
- <folding />
850
847
  </state>
851
848
  </provider>
852
849
  </entry>
@@ -882,7 +879,6 @@
882
879
  <provider selected="true" editor-type-id="text-editor">
883
880
  <state relative-caret-position="480">
884
881
  <caret line="32" column="0" lean-forward="true" selection-start-line="32" selection-start-column="0" selection-end-line="32" selection-end-column="0" />
885
- <folding />
886
882
  </state>
887
883
  </provider>
888
884
  </entry>
@@ -963,13 +959,6 @@
963
959
  </state>
964
960
  </provider>
965
961
  </entry>
966
- <entry file="file://$PROJECT_DIR$/test/sql_delete_not_necc.rb">
967
- <provider selected="true" editor-type-id="text-editor">
968
- <state relative-caret-position="90">
969
- <caret line="6" column="0" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
970
- </state>
971
- </provider>
972
- </entry>
973
962
  <entry file="file://$PROJECT_DIR$/lib/freewifi/cisco/iwag/get_iwag_data.rb">
974
963
  <provider selected="true" editor-type-id="text-editor">
975
964
  <state relative-caret-position="375">
@@ -988,7 +977,6 @@
988
977
  <provider selected="true" editor-type-id="text-editor">
989
978
  <state relative-caret-position="60">
990
979
  <caret line="4" column="0" lean-forward="false" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
991
- <folding />
992
980
  </state>
993
981
  </provider>
994
982
  </entry>
@@ -996,7 +984,6 @@
996
984
  <provider selected="true" editor-type-id="text-editor">
997
985
  <state relative-caret-position="341">
998
986
  <caret line="30" column="5" lean-forward="true" selection-start-line="30" selection-start-column="5" selection-end-line="30" selection-end-column="5" />
999
- <folding />
1000
987
  </state>
1001
988
  </provider>
1002
989
  </entry>
@@ -1004,7 +991,6 @@
1004
991
  <provider selected="true" editor-type-id="text-editor">
1005
992
  <state relative-caret-position="461">
1006
993
  <caret line="31" column="0" lean-forward="true" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="0" />
1007
- <folding />
1008
994
  </state>
1009
995
  </provider>
1010
996
  </entry>
@@ -1012,7 +998,6 @@
1012
998
  <provider selected="true" editor-type-id="text-editor">
1013
999
  <state relative-caret-position="90">
1014
1000
  <caret line="6" column="0" lean-forward="true" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
1015
- <folding />
1016
1001
  </state>
1017
1002
  </provider>
1018
1003
  </entry>
@@ -1020,7 +1005,6 @@
1020
1005
  <provider selected="true" editor-type-id="text-editor">
1021
1006
  <state relative-caret-position="0">
1022
1007
  <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1023
- <folding />
1024
1008
  </state>
1025
1009
  </provider>
1026
1010
  </entry>
@@ -1028,7 +1012,6 @@
1028
1012
  <provider selected="true" editor-type-id="text-editor">
1029
1013
  <state relative-caret-position="0">
1030
1014
  <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1031
- <folding />
1032
1015
  </state>
1033
1016
  </provider>
1034
1017
  </entry>
@@ -1036,7 +1019,6 @@
1036
1019
  <provider selected="true" editor-type-id="text-editor">
1037
1020
  <state relative-caret-position="150">
1038
1021
  <caret line="10" column="0" lean-forward="false" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
1039
- <folding />
1040
1022
  </state>
1041
1023
  </provider>
1042
1024
  </entry>
@@ -1044,7 +1026,6 @@
1044
1026
  <provider selected="true" editor-type-id="text-editor">
1045
1027
  <state relative-caret-position="746">
1046
1028
  <caret line="104" column="78" lean-forward="false" selection-start-line="104" selection-start-column="78" selection-end-line="104" selection-end-column="78" />
1047
- <folding />
1048
1029
  </state>
1049
1030
  </provider>
1050
1031
  </entry>
@@ -1052,102 +1033,130 @@
1052
1033
  <provider selected="true" editor-type-id="text-editor">
1053
1034
  <state relative-caret-position="195">
1054
1035
  <caret line="13" column="0" lean-forward="false" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
1036
+ </state>
1037
+ </provider>
1038
+ </entry>
1039
+ <entry file="file://$PROJECT_DIR$/lib/freewifi/cisco/iwag/iwag_telnet_connector.rb">
1040
+ <provider selected="true" editor-type-id="text-editor">
1041
+ <state relative-caret-position="1335">
1042
+ <caret line="89" column="93" lean-forward="false" selection-start-line="89" selection-start-column="93" selection-end-line="89" selection-end-column="93" />
1043
+ </state>
1044
+ </provider>
1045
+ </entry>
1046
+ <entry file="file://$PROJECT_DIR$/lib/freewifi/config.rb">
1047
+ <provider selected="true" editor-type-id="text-editor">
1048
+ <state relative-caret-position="15">
1049
+ <caret line="1" column="22" lean-forward="false" selection-start-line="1" selection-start-column="22" selection-end-line="1" selection-end-column="22" />
1050
+ </state>
1051
+ </provider>
1052
+ </entry>
1053
+ <entry file="file://$PROJECT_DIR$/lib/freewifi/additional/additional_functions.rb">
1054
+ <provider selected="true" editor-type-id="text-editor">
1055
+ <state relative-caret-position="30">
1056
+ <caret line="2" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
1057
+ </state>
1058
+ </provider>
1059
+ </entry>
1060
+ <entry file="file://$PROJECT_DIR$/test/sql_delete_not_necc.rb">
1061
+ <provider selected="true" editor-type-id="text-editor">
1062
+ <state relative-caret-position="90">
1063
+ <caret line="6" column="0" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
1055
1064
  <folding />
1056
1065
  </state>
1057
1066
  </provider>
1058
1067
  </entry>
1059
- <entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/getsubscribermikrotik.rb">
1068
+ <entry file="file://$PROJECT_DIR$/test/test2.rb">
1060
1069
  <provider selected="true" editor-type-id="text-editor">
1061
- <state relative-caret-position="0">
1062
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1070
+ <state relative-caret-position="135">
1071
+ <caret line="9" column="3" lean-forward="false" selection-start-line="9" selection-start-column="3" selection-end-line="9" selection-end-column="3" />
1063
1072
  <folding />
1064
1073
  </state>
1065
1074
  </provider>
1066
1075
  </entry>
1067
- <entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/newhub_mtik_ssh.rb">
1076
+ <entry file="file://$PROJECT_DIR$/test/test_helper.rb">
1068
1077
  <provider selected="true" editor-type-id="text-editor">
1069
- <state relative-caret-position="145">
1070
- <caret line="44" column="33" lean-forward="false" selection-start-line="44" selection-start-column="33" selection-end-line="44" selection-end-column="33" />
1078
+ <state relative-caret-position="1155">
1079
+ <caret line="77" column="1" lean-forward="false" selection-start-line="77" selection-start-column="1" selection-end-line="77" selection-end-column="1" />
1071
1080
  <folding />
1072
1081
  </state>
1073
1082
  </provider>
1074
1083
  </entry>
1075
- <entry file="file://$PROJECT_DIR$/lib/freewifi/cisco/iwag/iwag_telnet_connector.rb">
1084
+ <entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/newhub_mtik_ssh.rb">
1076
1085
  <provider selected="true" editor-type-id="text-editor">
1077
- <state relative-caret-position="145">
1078
- <caret line="89" column="93" lean-forward="false" selection-start-line="89" selection-start-column="93" selection-end-line="89" selection-end-column="93" />
1086
+ <state relative-caret-position="313">
1087
+ <caret line="22" column="0" lean-forward="false" selection-start-line="22" selection-start-column="0" selection-end-line="39" selection-end-column="7" />
1079
1088
  <folding />
1080
1089
  </state>
1081
1090
  </provider>
1082
1091
  </entry>
1083
- <entry file="file://$PROJECT_DIR$/lib/freewifi/general/wifi_portal_procedures.rb">
1092
+ <entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/getsubscribermikrotik.rb">
1084
1093
  <provider selected="true" editor-type-id="text-editor">
1085
- <state relative-caret-position="145">
1086
- <caret line="127" column="100" lean-forward="false" selection-start-line="127" selection-start-column="100" selection-end-line="127" selection-end-column="100" />
1094
+ <state relative-caret-position="0">
1095
+ <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1087
1096
  <folding />
1088
1097
  </state>
1089
1098
  </provider>
1090
1099
  </entry>
1091
- <entry file="file://$PROJECT_DIR$/lib/freewifi/config.rb">
1100
+ <entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/newhub_mtik_api.rb">
1092
1101
  <provider selected="true" editor-type-id="text-editor">
1093
- <state relative-caret-position="15">
1094
- <caret line="1" column="22" lean-forward="false" selection-start-line="1" selection-start-column="22" selection-end-line="1" selection-end-column="22" />
1102
+ <state relative-caret-position="-871">
1103
+ <caret line="21" column="20" lean-forward="true" selection-start-line="21" selection-start-column="20" selection-end-line="21" selection-end-column="20" />
1095
1104
  <folding />
1096
1105
  </state>
1097
1106
  </provider>
1098
1107
  </entry>
1099
1108
  <entry file="file://$PROJECT_DIR$/test/freewifi_test.rb">
1100
1109
  <provider selected="true" editor-type-id="text-editor">
1101
- <state relative-caret-position="0">
1102
- <caret line="0" column="21" lean-forward="false" selection-start-line="0" selection-start-column="21" selection-end-line="0" selection-end-column="21" />
1110
+ <state relative-caret-position="165">
1111
+ <caret line="11" column="0" lean-forward="false" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
1103
1112
  <folding />
1104
1113
  </state>
1105
1114
  </provider>
1106
1115
  </entry>
1107
- <entry file="file://$PROJECT_DIR$/test/test.rb">
1116
+ <entry file="file://$PROJECT_DIR$/lib/freewifi.rb">
1108
1117
  <provider selected="true" editor-type-id="text-editor">
1109
- <state relative-caret-position="45">
1110
- <caret line="3" column="14" lean-forward="false" selection-start-line="3" selection-start-column="14" selection-end-line="3" selection-end-column="14" />
1118
+ <state relative-caret-position="-633">
1119
+ <caret line="306" column="25" lean-forward="false" selection-start-line="306" selection-start-column="25" selection-end-line="306" selection-end-column="25" />
1111
1120
  <folding />
1112
1121
  </state>
1113
1122
  </provider>
1114
1123
  </entry>
1115
- <entry file="file://$PROJECT_DIR$/lib/freewifi/mikrotik/newhub_mtik_api.rb">
1124
+ <entry file="file://$PROJECT_DIR$/test/test.rb">
1116
1125
  <provider selected="true" editor-type-id="text-editor">
1117
- <state relative-caret-position="731">
1118
- <caret line="93" column="0" lean-forward="false" selection-start-line="93" selection-start-column="0" selection-end-line="93" selection-end-column="0" />
1126
+ <state relative-caret-position="45">
1127
+ <caret line="3" column="14" lean-forward="false" selection-start-line="3" selection-start-column="14" selection-end-line="3" selection-end-column="14" />
1119
1128
  <folding />
1120
1129
  </state>
1121
1130
  </provider>
1122
1131
  </entry>
1123
- <entry file="file://$PROJECT_DIR$/test/test_helper.rb">
1132
+ <entry file="file://$PROJECT_DIR$/lib/freewifi/version.rb">
1124
1133
  <provider selected="true" editor-type-id="text-editor">
1125
- <state relative-caret-position="145">
1126
- <caret line="25" column="18" lean-forward="false" selection-start-line="25" selection-start-column="18" selection-end-line="25" selection-end-column="18" />
1134
+ <state relative-caret-position="45">
1135
+ <caret line="3" column="0" lean-forward="true" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
1127
1136
  <folding />
1128
1137
  </state>
1129
1138
  </provider>
1130
1139
  </entry>
1131
- <entry file="file://$PROJECT_DIR$/lib/freewifi/additional/additional_functions.rb">
1140
+ <entry file="file://$PROJECT_DIR$/test/ssh_mtik_2.rb">
1132
1141
  <provider selected="true" editor-type-id="text-editor">
1133
- <state relative-caret-position="30">
1134
- <caret line="2" column="0" lean-forward="true" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
1142
+ <state relative-caret-position="1410">
1143
+ <caret line="94" column="4" lean-forward="true" selection-start-line="94" selection-start-column="4" selection-end-line="94" selection-end-column="4" />
1135
1144
  <folding />
1136
1145
  </state>
1137
1146
  </provider>
1138
1147
  </entry>
1139
- <entry file="file://$PROJECT_DIR$/lib/freewifi.rb">
1148
+ <entry file="file://$PROJECT_DIR$/test/ssh_mtik_1.rb">
1140
1149
  <provider selected="true" editor-type-id="text-editor">
1141
- <state relative-caret-position="205">
1142
- <caret line="251" column="7" lean-forward="true" selection-start-line="251" selection-start-column="7" selection-end-line="251" selection-end-column="7" />
1150
+ <state relative-caret-position="240">
1151
+ <caret line="16" column="0" lean-forward="true" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
1143
1152
  <folding />
1144
1153
  </state>
1145
1154
  </provider>
1146
1155
  </entry>
1147
- <entry file="file://$PROJECT_DIR$/lib/freewifi/version.rb">
1156
+ <entry file="file://$PROJECT_DIR$/lib/freewifi/general/wifi_portal_procedures.rb">
1148
1157
  <provider selected="true" editor-type-id="text-editor">
1149
- <state relative-caret-position="45">
1150
- <caret line="3" column="0" lean-forward="false" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
1158
+ <state relative-caret-position="104">
1159
+ <caret line="260" column="36" lean-forward="false" selection-start-line="260" selection-start-column="36" selection-end-line="260" selection-end-column="36" />
1151
1160
  <folding />
1152
1161
  </state>
1153
1162
  </provider>
data/.travis.yml CHANGED
File without changes
data/CODE_OF_CONDUCT.md CHANGED
File without changes
data/Gemfile CHANGED
File without changes
data/LICENSE.txt CHANGED
File without changes
data/README.md CHANGED
File without changes
data/Rakefile CHANGED
File without changes
data/freewifi.gemspec CHANGED
File without changes
data/lib/freewifi/additional/additional_functions.rb CHANGED
@@ -23,7 +23,7 @@ class InternalFunc_1
23
23
  response_mess = https_connector.request(request_mess)
24
24
  body = response_mess.body
25
25
  return {:code => 200,
26
- :result => "Request completed successfully",
26
+ :result => 'Request completed successfully',
27
27
  :body => {:telegram_resp => JSON.parse(body.to_s),
28
28
  :description => "Telegram message to telegram_chat_id: #{telegram_chat_id.to_s}"}}
29
29
  rescue
data/lib/freewifi/cisco/any/cisco_schemes_conf_gen.rb CHANGED
File without changes
data/lib/freewifi/cisco/iwag/get_iwag_data.rb CHANGED
File without changes
data/lib/freewifi/cisco/iwag/iwag_database_worker.rb CHANGED
File without changes
data/lib/freewifi/cisco/iwag/iwag_telnet_connector.rb CHANGED
File without changes
data/lib/freewifi/config.rb CHANGED
File without changes
data/lib/freewifi/database/mongo/mongoconnector.rb CHANGED
File without changes
data/lib/freewifi/database/mysql/database_methods_wifi.rb CHANGED
File without changes
data/lib/freewifi/general/wifi_portal_procedures.rb CHANGED
@@ -21,52 +21,58 @@ class WiFiPortal_1
21
21
  :mtik_api_connector,
22
22
  :hua_controller_connector,
23
23
  :iwag_connector1,
24
- :iwag_connector2
25
-
26
- def initialize(apigw_wsdl,
27
- apigw_endpoint,
28
- apigw_namespace,
29
- apigw_wsse_aut_log,
30
- apigw_wsse_aut_pass,
31
- iwag1_host,
32
- iwag1_username,
33
- iwag1_password,
34
- iwag1_port,
35
- mtik_control_ips_get,
36
- mtik_user,
37
- mtik_password,
38
- hua_wlc_1_ip,
39
- hua_wlc_2_ip,
40
- hua_wlc_login,
41
- hua_wlc_password,
42
- iwag2_host,
43
- iwag2_username,
44
- iwag2_password,
45
- iwag2_port
46
- )
47
- @iwag_telnet_connector = CSRtelnet_1.new(iwag1_host, iwag1_username, iwag1_password)
48
- @ard_api_gw_connector_wifi = Savon.client do
49
- #ssl_verify_mode :none
50
- wsdl apigw_wsdl
51
- endpoint apigw_endpoint
52
- namespace apigw_namespace
53
- wsse_auth(apigw_wsse_aut_log, apigw_wsse_aut_pass, :digest)
54
- encoding 'UTF-8'
55
- headers = {"Accept-Encoding" => "gzip, deflate", "Connection" => "Keep-Alive"}
56
- end
24
+ :iwag_connector2,
25
+ :protocol_mtik,
26
+ :mtik_capsman_list
27
+
28
+ def initialize(apigw_wsdl,
29
+ apigw_endpoint,
30
+ apigw_namespace,
31
+ apigw_wsse_aut_log,
32
+ apigw_wsse_aut_pass,
33
+ iwag1_host,
34
+ iwag1_username,
35
+ iwag1_password,
36
+ iwag1_port,
37
+ mtik_control_ips_get,
38
+ mtik_user,
39
+ mtik_password,
40
+ hua_wlc_1_ip,
41
+ hua_wlc_2_ip,
42
+ hua_wlc_login,
43
+ hua_wlc_password,
44
+ iwag2_host,
45
+ iwag2_username,
46
+ iwag2_password,
47
+ iwag2_port,
48
+ protocol_mtik,
49
+ mtik_capsman_list
50
+ )
51
+ @iwag_telnet_connector = CSRtelnet_1.new(iwag1_host, iwag1_username, iwag1_password)
52
+ @ard_api_gw_connector_wifi = Savon.client do
53
+ #ssl_verify_mode :none
54
+ wsdl apigw_wsdl
55
+ endpoint apigw_endpoint
56
+ namespace apigw_namespace
57
+ wsse_auth(apigw_wsse_aut_log, apigw_wsse_aut_pass, :digest)
58
+ encoding 'UTF-8'
59
+ headers = {"Accept-Encoding" => "gzip, deflate", "Connection" => "Keep-Alive"}
60
+ end
57
61
 
58
- @iwag1_host = iwag1_host
59
- @iwag_username = iwag1_username
60
- @iwag_password = iwag1_password
62
+ @iwag1_host = iwag1_host
63
+ @iwag_username = iwag1_username
64
+ @iwag_password = iwag1_password
61
65
 
62
- @mtik_api_connector = NEWhubWifiApi_1.new(mtik_control_ips_get, mtik_user, mtik_password)
66
+ @mtik_api_connector = NEWhubWifiApi_1.new(mtik_control_ips_get, mtik_user, mtik_password)
63
67
 
64
- @hua_controller_connector = HuaWifi_1.new(hua_wlc_1_ip, hua_wlc_2_ip, hua_wlc_login, hua_wlc_password)
68
+ @hua_controller_connector = HuaWifi_1.new(hua_wlc_1_ip, hua_wlc_2_ip, hua_wlc_login, hua_wlc_password)
65
69
 
66
- @iwag_connector1 = IwagRequester.new(iwag1_host, iwag1_username, iwag1_password, iwag1_port)
67
- @iwag_connector2 = IwagRequester.new(iwag2_host, iwag2_username, iwag2_password, iwag2_port)
70
+ @iwag_connector1 = IwagRequester.new(iwag1_host, iwag1_username, iwag1_password, iwag1_port)
71
+ @iwag_connector2 = IwagRequester.new(iwag2_host, iwag2_username, iwag2_password, iwag2_port)
68
72
 
69
- end
73
+ @protocol_mtik = protocol_mtik
74
+ @mtik_capsman_list = mtik_capsman_list
75
+ end
70
76
 
71
77
 
72
78
  def python_mac_iwag1_1(ipaddress)
@@ -252,13 +258,7 @@ class WiFiPortal_1
252
258
 
253
259
  def get_subs_add_info4new_1(access_interface, subscribers_mac)
254
260
 
255
- capsman_list = [
256
- "172.24.247.15",
257
- "172.24.214.155",
258
- "172.24.214.140",
259
- "172.24.214.105",
260
- "172.24.223.105"
261
- ]
261
+ capsman_list = mtik_capsman_list
262
262
 
263
263
  answer = ""
264
264
 
@@ -271,11 +271,27 @@ class WiFiPortal_1
271
271
  capsman_list.each do |capsman|
272
272
  threads_mikro_wlc << Thread.new do
273
273
  begin
274
- p mikr_info5 = mtik_api_connector.get_info_subs_from_mik_1(subscribers_mac, capsman)
275
- splitting5 = mikr_info5.split("---")
276
- if splitting5[1] != "not on mikrotik controller" && splitting5[1]!="unknown" && splitting5[1]!=nil
277
- answer = mikr_info5
278
- p answer
274
+ if protocol_mtik == 'api'
275
+ p mikr_info5 = mtik_api_connector.get_info_subs_from_mik_1(subscribers_mac, capsman)
276
+ splitting5 = mikr_info5.split("---")
277
+ if splitting5[1] != "not on mikrotik controller" && splitting5[1]!="unknown" && splitting5[1]!=nil
278
+ answer = mikr_info5
279
+ p answer
280
+ end
281
+ elsif protocol_mtik == 'ssh'
282
+ p mikr_info5 = mtik_api_connector.get_info_subs_from_mik_ssh(subscribers_mac, capsman)
283
+ splitting5 = mikr_info5.split("---")
284
+ if splitting5[1] != "not on mikrotik controller" && splitting5[1]!="unknown" && splitting5[1]!=nil
285
+ answer = mikr_info5
286
+ p answer
287
+ end
288
+ else
289
+ p mikr_info5 = mtik_api_connector.get_info_subs_from_mik_1(subscribers_mac, capsman)
290
+ splitting5 = mikr_info5.split("---")
291
+ if splitting5[1] != "not on mikrotik controller" && splitting5[1]!="unknown" && splitting5[1]!=nil
292
+ answer = mikr_info5
293
+ p answer
294
+ end
279
295
  end
280
296
  rescue
281
297
  p "thr0 wrong"
data/lib/freewifi/huawei/hua_controller_class.rb CHANGED
File without changes
data/lib/freewifi/mikrotik/automation/get_data_ssh_fun.rb CHANGED
File without changes
data/lib/freewifi/mikrotik/getsubscribermikrotik.rb CHANGED
File without changes
data/lib/freewifi/mikrotik/newhub_mtik_api.rb CHANGED
@@ -1,4 +1,5 @@
1
1
  require 'mtik'
2
+ require 'net/ssh'
2
3
 
3
4
  class NEWhubWifiApi_1
4
5
 
@@ -11,87 +12,184 @@ class NEWhubWifiApi_1
11
12
  end
12
13
 
13
14
 
14
- def get_info_subs_from_mik_1(subs_mac, controllers_ip)
15
- input_parameters = {:subs_mac => subs_mac, :controllers_ip => controllers_ip}
16
- #region get additional information
17
-
18
- subscribers_mac = subs_mac
19
- access_point =""
20
- ssid_ap =""
21
- tx_rate_set = ""
22
- tx_rate = ""
23
- rx_rate = ""
24
- rx_signal = ""
25
- uptime = ""
26
- packets = ""
27
- bytes = ""
28
-
29
- MTik::verbose = false
30
- mikrot_connection1 = MTik::Connection.new :host => controllers_ip, :user => mtik_user, :pass => mtik_password, :conn_timeout => 7, :cmd_timeout => 7
31
- mikrot_connection1.get_reply('/caps-man/registration-table/getall') do |req, sentence|
32
-
33
- req.reply.each do |reply|
34
- if reply.key?('mac-address')
35
- #p reply
36
- if reply['mac-address'] == subscribers_mac
37
-
38
- access_point = reply['interface']
39
- ssid_ap = reply['ssid']
40
- tx_rate = reply['tx-rate']
41
- rx_rate = reply['rx-rate']
42
- rx_signal = reply['rx-signal']
43
- uptime = reply['uptime']
44
- packets = reply['packets']
45
- bytes = reply['bytes']
46
- tx_rate_set = reply['tx-rate-set']
15
+ def get_info_subs_from_mik_1(subs_mac, controllers_ip)
16
+ input_parameters = {:subs_mac => subs_mac, :controllers_ip => controllers_ip}
17
+ #region get additional information
18
+
19
+ subscribers_mac = subs_mac
20
+ access_point =""
21
+ ssid_ap =""
22
+ tx_rate_set = ""
23
+ tx_rate = ""
24
+ rx_rate = ""
25
+ rx_signal = ""
26
+ uptime = ""
27
+ packets = ""
28
+ bytes = ""
29
+
30
+ MTik::verbose = false
31
+ mikrot_connection1 = MTik::Connection.new :host => controllers_ip, :user => mtik_user, :pass => mtik_password, :conn_timeout => 7, :cmd_timeout => 7
32
+ mikrot_connection1.get_reply('/caps-man/registration-table/getall') do |req, sentence|
33
+
34
+ req.reply.each do |reply|
35
+ if reply.key?('mac-address')
36
+ #p reply
37
+ if reply['mac-address'] == subscribers_mac
38
+
39
+ access_point = reply['interface']
40
+ ssid_ap = reply['ssid']
41
+ tx_rate = reply['tx-rate']
42
+ rx_rate = reply['rx-rate']
43
+ rx_signal = reply['rx-signal']
44
+ uptime = reply['uptime']
45
+ packets = reply['packets']
46
+ bytes = reply['bytes']
47
+ tx_rate_set = reply['tx-rate-set']
48
+ end
47
49
  end
48
50
  end
49
51
  end
50
- end
51
52
 
52
- if access_point=="" || ssid_ap=="" || packets==""
53
- access_point = "not on mikrotik controller"
54
- ssid_ap = "unknown"
55
- tx_rate_set = "unknown"
56
- tx_rate = "0"
57
- rx_rate = "0"
58
- rx_signal = "0"
59
- uptime = "0"
60
- packets = "0"
61
- bytes = "0"
62
- end
53
+ if access_point=="" || ssid_ap=="" || packets==""
54
+ access_point = "not on mikrotik controller"
55
+ ssid_ap = "unknown"
56
+ tx_rate_set = "unknown"
57
+ tx_rate = "0"
58
+ rx_rate = "0"
59
+ rx_signal = "0"
60
+ uptime = "0"
61
+ packets = "0"
62
+ bytes = "0"
63
+ end
64
+
65
+ if access_point==nil
66
+ access_point= "unknown"
67
+ end
68
+ if ssid_ap==nil
69
+ ssid_ap= "unknown"
70
+ end
71
+ if tx_rate_set==nil
72
+ tx_rate_set= "unknown"
73
+ end
74
+ if tx_rate==nil
75
+ tx_rate= "unknown"
76
+ end
77
+ if rx_rate==nil
78
+ rx_rate= "unknown"
79
+ end
80
+ if rx_signal==nil
81
+ rx_signal= "unknown"
82
+ end
83
+ if uptime==nil
84
+ uptime= "unknown"
85
+ end
86
+ if packets==nil
87
+ packets= "unknown"
88
+ end
89
+ if bytes==nil
90
+ bytes= "unknown"
91
+ end
92
+
93
+ #endregion
94
+ subscribers_mac+ "---" + access_point + "---" + ssid_ap + "---" + tx_rate_set + "---"+ tx_rate + "---"+ rx_rate + "---"+ rx_signal + "---"+ uptime + "---"+ packets + "---"+ bytes
63
95
 
64
- if access_point==nil
65
- access_point= "unknown"
66
- end
67
- if ssid_ap==nil
68
- ssid_ap= "unknown"
69
- end
70
- if tx_rate_set==nil
71
- tx_rate_set= "unknown"
72
- end
73
- if tx_rate==nil
74
- tx_rate= "unknown"
75
- end
76
- if rx_rate==nil
77
- rx_rate= "unknown"
78
- end
79
- if rx_signal==nil
80
- rx_signal= "unknown"
81
- end
82
- if uptime==nil
83
- uptime= "unknown"
84
- end
85
- if packets==nil
86
- packets= "unknown"
87
- end
88
- if bytes==nil
89
- bytes= "unknown"
90
96
  end
91
97
 
92
- #endregion
93
- subscribers_mac+ "---" + access_point + "---" + ssid_ap + "---" + tx_rate_set + "---"+ tx_rate + "---"+ rx_rate + "---"+ rx_signal + "---"+ uptime + "---"+ packets + "---"+ bytes
94
98
 
95
- end
99
+
100
+ def get_info_subs_from_mik_ssh(subs_mac, controllers_ip)
101
+ input_parameters = {:subs_mac => subs_mac, :controllers_ip => controllers_ip}
102
+ #region get additional information
103
+
104
+
105
+ subscribers_mac = subs_mac
106
+ access_point =""
107
+ ssid_ap =""
108
+ tx_rate_set = ""
109
+ tx_rate = ""
110
+ rx_rate = ""
111
+ rx_signal = ""
112
+ uptime = ""
113
+ packets = ""
114
+ bytes = ""
115
+
116
+ begin
117
+ Net::SSH.start(controllers_ip, mtik_user, :password => mtik_password) do |ssh|
118
+ #result = ssh.exec!("/interface eoip print where tunnel-id=#{tunnel_id}")
119
+ #p result
120
+ result = ssh.exec!("/caps-man registration-table print detail value-list where mac-address=#{subs_mac}")
121
+ p result
122
+ access_point_reg = /interface:\s(.+)\r\n/
123
+ access_point = result.scan(access_point_reg)[0][0]
124
+ ssid_reg = /ssid:\s(.+)\r\n/
125
+ ssid_ap = result.scan(ssid_reg)[0][0]
126
+
127
+ tx_rate_set = "unknown"
128
+ tx_rate = "0"
129
+ rx_rate = "0"
130
+ rx_signal = "0"
131
+ uptime = "0"
132
+ packets = "0"
133
+ bytes = "0"
134
+
135
+ p access_point
136
+ p ssid_ap
137
+ #regimsi = /\s+name="(.+)"\s+/
138
+ #m1 = regimsi.match(result)[1]
139
+
140
+ #result2 = ssh.exec!("interface bridge port add bridge=#{bridge_name} interface=#{tunnel_name}")
141
+ end
142
+ #Net::SSH.stop
143
+ rescue
144
+ nil
145
+ end
146
+
147
+ p "1111111111111111111"
148
+
149
+ if access_point=="" || ssid_ap=="" || packets==""
150
+ access_point = "not on mikrotik controller"
151
+ ssid_ap = "unknown"
152
+ tx_rate_set = "unknown"
153
+ tx_rate = "0"
154
+ rx_rate = "0"
155
+ rx_signal = "0"
156
+ uptime = "0"
157
+ packets = "0"
158
+ bytes = "0"
159
+ end
160
+
161
+ if access_point==nil || access_point==''
162
+ access_point= "unknown"
163
+ end
164
+ if ssid_ap==nil || ssid_ap==''
165
+ ssid_ap= "unknown"
166
+ end
167
+ if tx_rate_set==nil || tx_rate_set==''
168
+ tx_rate_set= "unknown"
169
+ end
170
+ if tx_rate==nil || tx_rate==''
171
+ tx_rate= "unknown"
172
+ end
173
+ if rx_rate==nil || rx_rate==''
174
+ rx_rate= "unknown"
175
+ end
176
+ if rx_signal==nil || rx_signal==''
177
+ rx_signal= "unknown"
178
+ end
179
+ if uptime==nil || uptime==''
180
+ uptime= "unknown"
181
+ end
182
+ if packets==nil || packets==''
183
+ packets= "unknown"
184
+ end
185
+ if bytes==nil || bytes==''
186
+ bytes= "unknown"
187
+ end
188
+
189
+ #endregion
190
+ subscribers_mac+ "---" + access_point + "---" + ssid_ap + "---" + tx_rate_set + "---"+ tx_rate + "---"+ rx_rate + "---"+ rx_signal + "---"+ uptime + "---"+ packets + "---"+ bytes
191
+
192
+ end
193
+
96
194
 
97
195
  end
data/lib/freewifi/mikrotik/newhub_mtik_ssh.rb CHANGED
File without changes
data/lib/freewifi/mikrotik/schemes_conf_gen.rb CHANGED
File without changes
data/lib/freewifi/params.rb CHANGED
File without changes
data/lib/freewifi/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Freewifi_1
2
- VERSION = '0.2.4'
2
+ VERSION = '0.2.5'
3
3
  end
data/lib/freewifi.rb CHANGED
@@ -303,7 +303,9 @@ class PortalFwifi_1
303
303
  iwag2_username,
304
304
  iwag2_password,
305
305
  iwag1_port=22,
306
- iwag2_port=22
306
+ iwag2_port=22,
307
+ protocol_mtik='api',
308
+ mtik_capsman_list
307
309
  )
308
310
 
309
311
  @general_procedures = WiFiPortal_1.new(apigw_wsdl,
@@ -325,7 +327,9 @@ class PortalFwifi_1
325
327
  iwag2_host,
326
328
  iwag2_username,
327
329
  iwag2_password,
328
- iwag2_port
330
+ iwag2_port,
331
+ protocol_mtik,
332
+ mtik_capsman_list
329
333
  )
330
334
  @mtik_control_ips_get = mtik_control_ips_get
331
335
  @mtik_user = mtik_user
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: freewifi
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.4
4
+ version: 0.2.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dzmitry Buynovskiy
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2021-01-04 00:00:00.000000000 Z
11
+ date: 2022-02-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler