nvram
This commit is contained in:
Cool-Y
parent
ed60af1265
commit
d80a1e043b
@ -77,11 +77,6 @@ time_format: HH:mm:ss
|
|||||||
per_page: 10
|
per_page: 10
|
||||||
pagination_dir: page
|
pagination_dir: page
|
||||||
|
|
||||||
search:
|
|
||||||
path: search.xml
|
|
||||||
field: post
|
|
||||||
format: html
|
|
||||||
limit: 10000
|
|
||||||
|
|
||||||
# Extensions
|
# Extensions
|
||||||
## Plugins: https://hexo.io/plugins/
|
## Plugins: https://hexo.io/plugins/
|
||||||
|
|||||||
296
package-lock.json
generated
296
package-lock.json
generated
@ -493,6 +493,17 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"clipboard": {
|
||||||
|
"version": "2.0.6",
|
||||||
|
"resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.6.tgz",
|
||||||
|
"integrity": "sha512-g5zbiixBRk/wyKakSwCKd7vQXDjFnAMGHoEyBogG/bw9kTD9GvdAvaoRR1ALcEzt3pVKxZR0pViekPMIS0QyGg==",
|
||||||
|
"optional": true,
|
||||||
|
"requires": {
|
||||||
|
"good-listener": "^1.2.2",
|
||||||
|
"select": "^1.1.2",
|
||||||
|
"tiny-emitter": "^2.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"cliui": {
|
"cliui": {
|
||||||
"version": "3.2.0",
|
"version": "3.2.0",
|
||||||
"resolved": "http://registry.npm.taobao.org/cliui/download/cliui-3.2.0.tgz",
|
"resolved": "http://registry.npm.taobao.org/cliui/download/cliui-3.2.0.tgz",
|
||||||
@ -666,6 +677,11 @@
|
|||||||
"resolved": "http://registry.npm.taobao.org/decode-uri-component/download/decode-uri-component-0.2.0.tgz",
|
"resolved": "http://registry.npm.taobao.org/decode-uri-component/download/decode-uri-component-0.2.0.tgz",
|
||||||
"integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
|
"integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU="
|
||||||
},
|
},
|
||||||
|
"deepmerge": {
|
||||||
|
"version": "4.2.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
|
||||||
|
"integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="
|
||||||
|
},
|
||||||
"define-property": {
|
"define-property": {
|
||||||
"version": "2.0.2",
|
"version": "2.0.2",
|
||||||
"resolved": "http://registry.npm.taobao.org/define-property/download/define-property-2.0.2.tgz",
|
"resolved": "http://registry.npm.taobao.org/define-property/download/define-property-2.0.2.tgz",
|
||||||
@ -713,6 +729,12 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"delegate": {
|
||||||
|
"version": "3.2.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz",
|
||||||
|
"integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==",
|
||||||
|
"optional": true
|
||||||
|
},
|
||||||
"depd": {
|
"depd": {
|
||||||
"version": "1.1.2",
|
"version": "1.1.2",
|
||||||
"resolved": "http://registry.npm.taobao.org/depd/download/depd-1.1.2.tgz",
|
"resolved": "http://registry.npm.taobao.org/depd/download/depd-1.1.2.tgz",
|
||||||
@ -1433,6 +1455,15 @@
|
|||||||
"resolved": "http://registry.npm.taobao.org/globals/download/globals-11.11.0.tgz",
|
"resolved": "http://registry.npm.taobao.org/globals/download/globals-11.11.0.tgz",
|
||||||
"integrity": "sha1-3Pk3V/ot5Uhvvu1xGFOK33ienC4="
|
"integrity": "sha1-3Pk3V/ot5Uhvvu1xGFOK33ienC4="
|
||||||
},
|
},
|
||||||
|
"good-listener": {
|
||||||
|
"version": "1.2.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz",
|
||||||
|
"integrity": "sha1-1TswzfkxPf+33JoNR3CWqm0UXFA=",
|
||||||
|
"optional": true,
|
||||||
|
"requires": {
|
||||||
|
"delegate": "^3.1.2"
|
||||||
|
}
|
||||||
|
},
|
||||||
"graceful-fs": {
|
"graceful-fs": {
|
||||||
"version": "4.1.15",
|
"version": "4.1.15",
|
||||||
"resolved": "http://registry.npm.taobao.org/graceful-fs/download/graceful-fs-4.1.15.tgz",
|
"resolved": "http://registry.npm.taobao.org/graceful-fs/download/graceful-fs-4.1.15.tgz",
|
||||||
@ -2029,6 +2060,153 @@
|
|||||||
"object-assign": "^4.0.1"
|
"object-assign": "^4.0.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"hexo-generator-json-content": {
|
||||||
|
"version": "4.2.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/hexo-generator-json-content/-/hexo-generator-json-content-4.2.3.tgz",
|
||||||
|
"integrity": "sha512-XGqCaTUr6+X8Ty/YvRi+0eh0DJgHcp+lgBhn+Sgyh6ev40P0cwamwJyaZroTdHt8GPoBwbSGVu0H/CdzEf0lFA==",
|
||||||
|
"requires": {
|
||||||
|
"hexo-util": "^2.4.0",
|
||||||
|
"keyword-extractor": "^0.0.19",
|
||||||
|
"moment": "^2.29.1"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"camel-case": {
|
||||||
|
"version": "4.1.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
|
||||||
|
"integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
|
||||||
|
"requires": {
|
||||||
|
"pascal-case": "^3.1.2",
|
||||||
|
"tslib": "^2.0.3"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"cross-spawn": {
|
||||||
|
"version": "7.0.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
|
||||||
|
"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
|
||||||
|
"requires": {
|
||||||
|
"path-key": "^3.1.0",
|
||||||
|
"shebang-command": "^2.0.0",
|
||||||
|
"which": "^2.0.1"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"dom-serializer": {
|
||||||
|
"version": "1.2.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.2.0.tgz",
|
||||||
|
"integrity": "sha512-n6kZFH/KlCrqs/1GHMOd5i2fd/beQHuehKdWvNNffbGHTr/almdhuVvTVFb3V7fglz+nC50fFusu3lY33h12pA==",
|
||||||
|
"requires": {
|
||||||
|
"domelementtype": "^2.0.1",
|
||||||
|
"domhandler": "^4.0.0",
|
||||||
|
"entities": "^2.0.0"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"domhandler": {
|
||||||
|
"version": "4.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.0.0.tgz",
|
||||||
|
"integrity": "sha512-KPTbnGQ1JeEMQyO1iYXoagsI6so/C96HZiFyByU3T6iAzpXn8EGEvct6unm1ZGoed8ByO2oirxgwxBmqKF9haA==",
|
||||||
|
"requires": {
|
||||||
|
"domelementtype": "^2.1.0"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"domelementtype": {
|
||||||
|
"version": "2.1.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.1.0.tgz",
|
||||||
|
"integrity": "sha512-LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w=="
|
||||||
|
},
|
||||||
|
"domhandler": {
|
||||||
|
"version": "3.3.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-3.3.0.tgz",
|
||||||
|
"integrity": "sha512-J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA==",
|
||||||
|
"requires": {
|
||||||
|
"domelementtype": "^2.0.1"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"domutils": {
|
||||||
|
"version": "2.4.4",
|
||||||
|
"resolved": "https://registry.npmjs.org/domutils/-/domutils-2.4.4.tgz",
|
||||||
|
"integrity": "sha512-jBC0vOsECI4OMdD0GC9mGn7NXPLb+Qt6KW1YDQzeQYRUFKmNG8lh7mO5HiELfr+lLQE7loDVI4QcAxV80HS+RA==",
|
||||||
|
"requires": {
|
||||||
|
"dom-serializer": "^1.0.1",
|
||||||
|
"domelementtype": "^2.0.1",
|
||||||
|
"domhandler": "^4.0.0"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"domhandler": {
|
||||||
|
"version": "4.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.0.0.tgz",
|
||||||
|
"integrity": "sha512-KPTbnGQ1JeEMQyO1iYXoagsI6so/C96HZiFyByU3T6iAzpXn8EGEvct6unm1ZGoed8ByO2oirxgwxBmqKF9haA==",
|
||||||
|
"requires": {
|
||||||
|
"domelementtype": "^2.1.0"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"entities": {
|
||||||
|
"version": "2.1.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz",
|
||||||
|
"integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w=="
|
||||||
|
},
|
||||||
|
"hexo-util": {
|
||||||
|
"version": "2.4.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/hexo-util/-/hexo-util-2.4.0.tgz",
|
||||||
|
"integrity": "sha512-IPQvAyn0cznYMU2gskMiZ6LZEvN7wHNusrJoYxrir4f7S7POpZeDTBswiko9R1qqd+/hu07wUYZdm4ceTTCEaA==",
|
||||||
|
"requires": {
|
||||||
|
"bluebird": "^3.5.2",
|
||||||
|
"camel-case": "^4.0.0",
|
||||||
|
"cross-spawn": "^7.0.0",
|
||||||
|
"deepmerge": "^4.2.2",
|
||||||
|
"highlight.js": "^10.0.0",
|
||||||
|
"htmlparser2": "^4.0.0",
|
||||||
|
"prismjs": "^1.17.1",
|
||||||
|
"strip-indent": "^3.0.0",
|
||||||
|
"striptags": "^3.1.1"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"highlight.js": {
|
||||||
|
"version": "10.5.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/highlight.js/-/highlight.js-10.5.0.tgz",
|
||||||
|
"integrity": "sha512-xTmvd9HiIHR6L53TMC7TKolEj65zG1XU+Onr8oi86mYa+nLcIbxTTWkpW7CsEwv/vK7u1zb8alZIMLDqqN6KTw=="
|
||||||
|
},
|
||||||
|
"htmlparser2": {
|
||||||
|
"version": "4.1.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-4.1.0.tgz",
|
||||||
|
"integrity": "sha512-4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q==",
|
||||||
|
"requires": {
|
||||||
|
"domelementtype": "^2.0.1",
|
||||||
|
"domhandler": "^3.0.0",
|
||||||
|
"domutils": "^2.0.0",
|
||||||
|
"entities": "^2.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"moment": {
|
||||||
|
"version": "2.29.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz",
|
||||||
|
"integrity": "sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="
|
||||||
|
},
|
||||||
|
"strip-indent": {
|
||||||
|
"version": "3.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
|
||||||
|
"integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
|
||||||
|
"requires": {
|
||||||
|
"min-indent": "^1.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"striptags": {
|
||||||
|
"version": "3.1.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/striptags/-/striptags-3.1.1.tgz",
|
||||||
|
"integrity": "sha1-yMPn/db7S7OjKjt1LltePjgJPr0="
|
||||||
|
},
|
||||||
|
"which": {
|
||||||
|
"version": "2.0.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
|
||||||
|
"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
|
||||||
|
"requires": {
|
||||||
|
"isexe": "^2.0.0"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"hexo-generator-search": {
|
"hexo-generator-search": {
|
||||||
"version": "2.4.0",
|
"version": "2.4.0",
|
||||||
"resolved": "http://registry.npm.taobao.org/hexo-generator-search/download/hexo-generator-search-2.4.0.tgz",
|
"resolved": "http://registry.npm.taobao.org/hexo-generator-search/download/hexo-generator-search-2.4.0.tgz",
|
||||||
@ -2588,6 +2766,34 @@
|
|||||||
"resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
|
"resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
|
||||||
"integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA="
|
"integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA="
|
||||||
},
|
},
|
||||||
|
"keyword-extractor": {
|
||||||
|
"version": "0.0.19",
|
||||||
|
"resolved": "https://registry.npmjs.org/keyword-extractor/-/keyword-extractor-0.0.19.tgz",
|
||||||
|
"integrity": "sha512-DmDgxAyICtLfowsP6ElzcV8ctv/OhqrpED4EINrIE5kl46rtRDmN9Ab4NsUMoy7ULm8rxS46Fc/eHMlhD02HIg==",
|
||||||
|
"requires": {
|
||||||
|
"js-yaml": ">=3.13.1",
|
||||||
|
"kind-of": ">=6.0.3",
|
||||||
|
"minimist": ">=0.2.1",
|
||||||
|
"set-value": ">=2.0.1",
|
||||||
|
"underscore": "1.10.2",
|
||||||
|
"underscore.string": "3.3.5"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"kind-of": {
|
||||||
|
"version": "6.0.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
|
||||||
|
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
|
||||||
|
},
|
||||||
|
"set-value": {
|
||||||
|
"version": "3.0.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/set-value/-/set-value-3.0.2.tgz",
|
||||||
|
"integrity": "sha512-npjkVoz+ank0zjlV9F47Fdbjfj/PfXyVhZvGALWsyIYU/qrMzpi6avjKW3/7KeSU2Df3I46BrN1xOI1+6vW0hA==",
|
||||||
|
"requires": {
|
||||||
|
"is-plain-object": "^2.0.4"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"kind-of": {
|
"kind-of": {
|
||||||
"version": "3.2.2",
|
"version": "3.2.2",
|
||||||
"resolved": "http://registry.npm.taobao.org/kind-of/download/kind-of-3.2.2.tgz",
|
"resolved": "http://registry.npm.taobao.org/kind-of/download/kind-of-3.2.2.tgz",
|
||||||
@ -2762,6 +2968,11 @@
|
|||||||
"mime-db": "~1.38.0"
|
"mime-db": "~1.38.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"min-indent": {
|
||||||
|
"version": "1.0.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
|
||||||
|
"integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg=="
|
||||||
|
},
|
||||||
"minimatch": {
|
"minimatch": {
|
||||||
"version": "3.0.4",
|
"version": "3.0.4",
|
||||||
"resolved": "http://registry.npm.taobao.org/minimatch/download/minimatch-3.0.4.tgz",
|
"resolved": "http://registry.npm.taobao.org/minimatch/download/minimatch-3.0.4.tgz",
|
||||||
@ -3450,6 +3661,34 @@
|
|||||||
"resolved": "http://registry.npm.taobao.org/parseurl/download/parseurl-1.3.2.tgz",
|
"resolved": "http://registry.npm.taobao.org/parseurl/download/parseurl-1.3.2.tgz",
|
||||||
"integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M="
|
"integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M="
|
||||||
},
|
},
|
||||||
|
"pascal-case": {
|
||||||
|
"version": "3.1.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
|
||||||
|
"integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
|
||||||
|
"requires": {
|
||||||
|
"no-case": "^3.0.4",
|
||||||
|
"tslib": "^2.0.3"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"lower-case": {
|
||||||
|
"version": "2.0.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
|
||||||
|
"integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
|
||||||
|
"requires": {
|
||||||
|
"tslib": "^2.0.3"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"no-case": {
|
||||||
|
"version": "3.0.4",
|
||||||
|
"resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
|
||||||
|
"integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
|
||||||
|
"requires": {
|
||||||
|
"lower-case": "^2.0.2",
|
||||||
|
"tslib": "^2.0.3"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"pascalcase": {
|
"pascalcase": {
|
||||||
"version": "0.1.1",
|
"version": "0.1.1",
|
||||||
"resolved": "http://registry.npm.taobao.org/pascalcase/download/pascalcase-0.1.1.tgz",
|
"resolved": "http://registry.npm.taobao.org/pascalcase/download/pascalcase-0.1.1.tgz",
|
||||||
@ -3465,6 +3704,11 @@
|
|||||||
"resolved": "http://registry.npm.taobao.org/path-is-absolute/download/path-is-absolute-1.0.1.tgz",
|
"resolved": "http://registry.npm.taobao.org/path-is-absolute/download/path-is-absolute-1.0.1.tgz",
|
||||||
"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
|
"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
|
||||||
},
|
},
|
||||||
|
"path-key": {
|
||||||
|
"version": "3.1.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
|
||||||
|
"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q=="
|
||||||
|
},
|
||||||
"path-parse": {
|
"path-parse": {
|
||||||
"version": "1.0.6",
|
"version": "1.0.6",
|
||||||
"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
|
"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
|
||||||
@ -3490,6 +3734,14 @@
|
|||||||
"resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
|
"resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
|
||||||
"integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE="
|
"integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE="
|
||||||
},
|
},
|
||||||
|
"prismjs": {
|
||||||
|
"version": "1.23.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.23.0.tgz",
|
||||||
|
"integrity": "sha512-c29LVsqOaLbBHuIbsTxaKENh1N2EQBOHaWv7gkHN4dgRbxSREqDnDbtFJYdpPauS4YCplMSNCABQ6Eeor69bAA==",
|
||||||
|
"requires": {
|
||||||
|
"clipboard": "^2.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"process-nextick-args": {
|
"process-nextick-args": {
|
||||||
"version": "2.0.0",
|
"version": "2.0.0",
|
||||||
"resolved": "http://registry.npm.taobao.org/process-nextick-args/download/process-nextick-args-2.0.0.tgz",
|
"resolved": "http://registry.npm.taobao.org/process-nextick-args/download/process-nextick-args-2.0.0.tgz",
|
||||||
@ -3910,6 +4162,12 @@
|
|||||||
"resolved": "http://registry.npm.taobao.org/sax/download/sax-0.5.8.tgz",
|
"resolved": "http://registry.npm.taobao.org/sax/download/sax-0.5.8.tgz",
|
||||||
"integrity": "sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE="
|
"integrity": "sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE="
|
||||||
},
|
},
|
||||||
|
"select": {
|
||||||
|
"version": "1.1.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
|
||||||
|
"integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0=",
|
||||||
|
"optional": true
|
||||||
|
},
|
||||||
"send": {
|
"send": {
|
||||||
"version": "0.16.2",
|
"version": "0.16.2",
|
||||||
"resolved": "http://registry.npm.taobao.org/send/download/send-0.16.2.tgz",
|
"resolved": "http://registry.npm.taobao.org/send/download/send-0.16.2.tgz",
|
||||||
@ -3979,6 +4237,19 @@
|
|||||||
"resolved": "http://registry.npm.taobao.org/setprototypeof/download/setprototypeof-1.1.0.tgz",
|
"resolved": "http://registry.npm.taobao.org/setprototypeof/download/setprototypeof-1.1.0.tgz",
|
||||||
"integrity": "sha1-0L2FU2iHtv58DYGMuWLZ2RxU5lY="
|
"integrity": "sha1-0L2FU2iHtv58DYGMuWLZ2RxU5lY="
|
||||||
},
|
},
|
||||||
|
"shebang-command": {
|
||||||
|
"version": "2.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
|
||||||
|
"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
|
||||||
|
"requires": {
|
||||||
|
"shebang-regex": "^3.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"shebang-regex": {
|
||||||
|
"version": "3.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
|
||||||
|
"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="
|
||||||
|
},
|
||||||
"snapdragon": {
|
"snapdragon": {
|
||||||
"version": "0.8.2",
|
"version": "0.8.2",
|
||||||
"resolved": "http://registry.npm.taobao.org/snapdragon/download/snapdragon-0.8.2.tgz",
|
"resolved": "http://registry.npm.taobao.org/snapdragon/download/snapdragon-0.8.2.tgz",
|
||||||
@ -4267,6 +4538,12 @@
|
|||||||
"os-homedir": "^1.0.0"
|
"os-homedir": "^1.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"tiny-emitter": {
|
||||||
|
"version": "2.1.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
|
||||||
|
"integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==",
|
||||||
|
"optional": true
|
||||||
|
},
|
||||||
"titlecase": {
|
"titlecase": {
|
||||||
"version": "1.1.3",
|
"version": "1.1.3",
|
||||||
"resolved": "https://registry.npmjs.org/titlecase/-/titlecase-1.1.3.tgz",
|
"resolved": "https://registry.npmjs.org/titlecase/-/titlecase-1.1.3.tgz",
|
||||||
@ -4320,6 +4597,11 @@
|
|||||||
"resolved": "http://registry.npm.taobao.org/trim-right/download/trim-right-1.0.1.tgz",
|
"resolved": "http://registry.npm.taobao.org/trim-right/download/trim-right-1.0.1.tgz",
|
||||||
"integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM="
|
"integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM="
|
||||||
},
|
},
|
||||||
|
"tslib": {
|
||||||
|
"version": "2.1.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz",
|
||||||
|
"integrity": "sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A=="
|
||||||
|
},
|
||||||
"uglify-js": {
|
"uglify-js": {
|
||||||
"version": "2.6.0",
|
"version": "2.6.0",
|
||||||
"resolved": "http://registry.npm.taobao.org/uglify-js/download/uglify-js-2.6.0.tgz",
|
"resolved": "http://registry.npm.taobao.org/uglify-js/download/uglify-js-2.6.0.tgz",
|
||||||
@ -4374,6 +4656,20 @@
|
|||||||
"resolved": "http://registry.npm.taobao.org/uglify-to-browserify/download/uglify-to-browserify-1.0.2.tgz",
|
"resolved": "http://registry.npm.taobao.org/uglify-to-browserify/download/uglify-to-browserify-1.0.2.tgz",
|
||||||
"integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc="
|
"integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc="
|
||||||
},
|
},
|
||||||
|
"underscore": {
|
||||||
|
"version": "1.10.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.10.2.tgz",
|
||||||
|
"integrity": "sha512-N4P+Q/BuyuEKFJ43B9gYuOj4TQUHXX+j2FqguVOpjkssLUUrnJofCcBccJSCoeturDoZU6GorDTHSvUDlSQbTg=="
|
||||||
|
},
|
||||||
|
"underscore.string": {
|
||||||
|
"version": "3.3.5",
|
||||||
|
"resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.5.tgz",
|
||||||
|
"integrity": "sha512-g+dpmgn+XBneLmXXo+sGlW5xQEt4ErkS3mgeN2GFbremYeMBSJKr9Wf2KJplQVaiPY/f7FN6atosWYNm9ovrYg==",
|
||||||
|
"requires": {
|
||||||
|
"sprintf-js": "^1.0.3",
|
||||||
|
"util-deprecate": "^1.0.2"
|
||||||
|
}
|
||||||
|
},
|
||||||
"union-value": {
|
"union-value": {
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"resolved": "http://registry.npm.taobao.org/union-value/download/union-value-1.0.0.tgz",
|
"resolved": "http://registry.npm.taobao.org/union-value/download/union-value-1.0.0.tgz",
|
||||||
|
|||||||
@ -13,6 +13,7 @@
|
|||||||
"hexo-generator-baidu-sitemap": "^0.1.6",
|
"hexo-generator-baidu-sitemap": "^0.1.6",
|
||||||
"hexo-generator-category": "^0.1.3",
|
"hexo-generator-category": "^0.1.3",
|
||||||
"hexo-generator-index": "^0.2.1",
|
"hexo-generator-index": "^0.2.1",
|
||||||
|
"hexo-generator-json-content": "^4.2.3",
|
||||||
"hexo-generator-search": "^2.4.0",
|
"hexo-generator-search": "^2.4.0",
|
||||||
"hexo-generator-searchdb": "^1.3.3",
|
"hexo-generator-searchdb": "^1.3.3",
|
||||||
"hexo-generator-sitemap": "^1.2.0",
|
"hexo-generator-sitemap": "^1.2.0",
|
||||||
|
|||||||
165
source/_posts/nvram-config.md
Normal file
165
source/_posts/nvram-config.md
Normal file
@ -0,0 +1,165 @@
|
|||||||
|
---
|
||||||
|
title: 自动化获取nvram配置
|
||||||
|
date: 2021-01-08 16:27:26
|
||||||
|
tags:
|
||||||
|
- Netgear
|
||||||
|
- UPnP
|
||||||
|
- NVRAM
|
||||||
|
- 固件模拟
|
||||||
|
categories:
|
||||||
|
- IOT
|
||||||
|
---
|
||||||
|
|
||||||
|
ARMX作者说，nvram的内容必须从正在运行的设备中提取。
|
||||||
|
一种方法是转储包含nvram数据的mtdblock， /proc/mtd可能有助于识别哪个mtdblock包含nvram。
|
||||||
|
另一种方法是，如果您可以通过UART进行命令行访问（当然可以访问实际的硬件），某些固件会提供nvram命令，运行“ nvram show”也可以获取nvram内容。
|
||||||
|
https://github.com/therealsaumil/armx/issues/4
|
||||||
|
|
||||||
|
知道创宇的研究人员说，nvram配置，可以查看对应的汇编代码逻辑（配置的有问题的话很容易触发段错误）。
|
||||||
|
|
||||||
|
我需要无需硬件自动化的处理大批设备的nvram配置，上面两种方法都无法适用。但我发现Netgear的nvram配置有这两个te'd
|
||||||
|
|
||||||
|
* upnp等二进制程序通过nvram_match来匹配nvram变量与预期值
|
||||||
|
* libnvram在data段存储了设备的默认nvram配置，**数据段**（data segment）通常是指用来存放[程序](https://zh.wikipedia.org/wiki/%E7%A8%8B%E5%BA%8F)中已[初始化且不为0](https://zh.wikipedia.org/w/index.php?title=%E5%88%9D%E5%A7%8B%E5%8C%96%E4%B8%94%E4%B8%8D%E4%B8%BA0&action=edit&redlink=1)的[全局变量](https://zh.wikipedia.org/wiki/%E5%85%A8%E5%B1%80%E5%8F%98%E9%87%8F)的一块内存区域。数据段属于[静态内存分配](https://zh.wikipedia.org/wiki/%E9%9D%99%E6%80%81%E5%86%85%E5%AD%98%E5%88%86%E9%85%8D)。
|
||||||
|
|
||||||
|
于是根据这两个事实做了两个实验：
|
||||||
|
|
||||||
|
## match函数
|
||||||
|
|
||||||
|
该函数的逻辑如下，a1为要查询的key，a2为待比较的对应value，调用nvram_get获得nvram中a1的value，然后和a2比较，相同的话返回1。
|
||||||
|
|
||||||
|
```
|
||||||
|
const char *__fastcall acosNvramConfig_match(int a1, const char *a2)
|
||||||
|
{
|
||||||
|
const char *v2; // r4
|
||||||
|
const char *result; // r0
|
||||||
|
int v4; // [sp+0h] [bp-1008h]
|
||||||
|
|
||||||
|
v2 = a2;
|
||||||
|
result = (const char *)j_nvram_get(a1, &v4, 4096);
|
||||||
|
if ( result )
|
||||||
|
result = (const char *)(strcmp(result, v2) == 0);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
在upnp二进制程序汇编代码中，调用acosNvramConfig_match来比较nvram
|
||||||
|
|
||||||
|
我做出了一个假设：所有a2都是能够使程序正常运行的nvram值，现在想要获取它。编写IDA脚本如下：
|
||||||
|
|
||||||
|
```
|
||||||
|
def GetAddr(func_name):
|
||||||
|
func_list = Functions()
|
||||||
|
for func in func_list:
|
||||||
|
name = GetFunctionName(func)
|
||||||
|
if func_name == name:
|
||||||
|
print(name,hex(func))
|
||||||
|
func_addr=func
|
||||||
|
return func_addr
|
||||||
|
|
||||||
|
func_addr = GetAddr('acosNvramConfig_match')
|
||||||
|
#func_addr=0xa3d4
|
||||||
|
|
||||||
|
for x in XrefsTo(func_addr,flags=0):
|
||||||
|
print "XrefsTo nvram-match func addr: %s"%hex(x.frm)
|
||||||
|
match_addr = x.frm
|
||||||
|
val_addr = PrevHead(match_addr)
|
||||||
|
key_addr = PrevHead(val_addr)
|
||||||
|
if GetMnem(key_addr) == 'LDR':
|
||||||
|
instr = GetDisasm(prevaddr)
|
||||||
|
#print('LDR instruction: %s'%instr)
|
||||||
|
addr = GetOperandValue(key_addr,1)
|
||||||
|
key = GetString(Dword(addr))
|
||||||
|
print('nvram key: %s'%key)
|
||||||
|
if GetMnem(val_addr) == 'LDR':
|
||||||
|
instr = GetDisasm(prevaddr)
|
||||||
|
#print('LDR instruction: %s'%instr)
|
||||||
|
addr = GetOperandValue(val_addr,1)
|
||||||
|
val = GetString(Dword(addr))
|
||||||
|
print('nvram value: %s'%val)
|
||||||
|
```
|
||||||
|
|
||||||
|
1. GetAddr(func_name) 根据函数名获得地址，这里获得了'acosNvramConfig_match'的地址0xa3d4；
|
||||||
|
2. 找到所有引用过该函数的地址，并且提取作为参数的数据。获取到函数的引用非常的简单，只需要使用XrefsTo()这个API函数就能达到我们的目的。
|
||||||
|
3. value是调用match函数的前一条指令；key是调用match函数的前两条指令；操作码都是LDR;
|
||||||
|
4. 使用GetOperandValue() 这个指令得到第二个操作数的值。注意该值存放的是“存放字符串地址”的地址
|
||||||
|
5. 使用Dword(addr)获取“存放字符串地址”，使用GetString()这个API函数从该偏移提取字符串
|
||||||
|
|
||||||
|
粘贴部分结果，有大量的重复，还有许多键值不存在，假设不成立。
|
||||||
|
|
||||||
|
```
|
||||||
|
('acosNvramConfig_match', '0xa3d4L')
|
||||||
|
XrefsTo nvram-match func addr: 0xc940L
|
||||||
|
nvram key: qos_bw_set_sel
|
||||||
|
nvram value: 1
|
||||||
|
XrefsTo nvram-match func addr: 0xc9b4L
|
||||||
|
nvram key: qos_bw_enable
|
||||||
|
nvram value: 1
|
||||||
|
XrefsTo nvram-match func addr: 0xfbd0L
|
||||||
|
nvram key: wlg_band
|
||||||
|
nvram value: 2.4G
|
||||||
|
XrefsTo nvram-match func addr: 0xfc84L
|
||||||
|
nvram value: 5G
|
||||||
|
XrefsTo nvram-match func addr: 0xff70L
|
||||||
|
nvram key: wlg_band
|
||||||
|
nvram value: 2.4G
|
||||||
|
nvram value: static
|
||||||
|
XrefsTo nvram-match func addr: 0x13d2cL
|
||||||
|
nvram key: board_id
|
||||||
|
nvram value: U12H127T00_NETGEAR
|
||||||
|
```
|
||||||
|
|
||||||
|
## NVRAM默认配置
|
||||||
|
|
||||||
|
如上所述，libnvram.so中data段存放着默认配置
|
||||||
|
|
||||||
|
利用IDApython获取该区域存放的键值，注意：该区域并不存放字符串，而是存放“存放字符串地址处”的地址，所以也要通过Doword来获取实际地址
|
||||||
|
|
||||||
|
```
|
||||||
|
import idautils
|
||||||
|
for seg in idautils.Segments():
|
||||||
|
if SegName(seg) == '.data':
|
||||||
|
start = idc.SegStart(seg)
|
||||||
|
end = idc.SegEnd(seg)
|
||||||
|
print idc.SegName(seg),start,end
|
||||||
|
while(start!=end):
|
||||||
|
key = GetString(Dword(start))
|
||||||
|
if key != None and key != '0':
|
||||||
|
start += 4
|
||||||
|
val = GetString(Dword(start))
|
||||||
|
if 'upnp' in key:
|
||||||
|
print('%s=%s'%(key,val))
|
||||||
|
start += 4
|
||||||
|
```
|
||||||
|
|
||||||
|
这里我们只关注有upnp特征的键值对
|
||||||
|
|
||||||
|
```
|
||||||
|
.data [77868 94004](tel:7786894004)
|
||||||
|
upnp_enable=1
|
||||||
|
upnp_turn_on=1
|
||||||
|
upnp_advert_period=30
|
||||||
|
upnp_advert_ttl=4
|
||||||
|
upnp_portmap_entry=0
|
||||||
|
upnp_duration=3600
|
||||||
|
upnp_DHCPServerConfigurable=1
|
||||||
|
```
|
||||||
|
|
||||||
|
另外再补充几个与网络有关的配置
|
||||||
|
|
||||||
|
```
|
||||||
|
friendly_name=Netgear
|
||||||
|
lan_hwaddr=AA:BB:CC:DD:EE:FF
|
||||||
|
lan_ipaddr=192.168.2.2
|
||||||
|
```
|
||||||
|
|
||||||
|
使用这个配置成功仿真~
|
||||||
|
|
||||||
|
|
||||||
|
## 一些IDApython使用方法
|
||||||
|
|
||||||
|
蒸米写的：https://wooyun.js.org/drops/IDAPython%20%E8%AE%A9%E4%BD%A0%E7%9A%84%E7%94%9F%E6%B4%BB%E6%9B%B4%E6%BB%8B%E6%B6%A6%20part1%20and%20part2.html
|
||||||
|
https://cartermgj.github.io/2017/10/10/ida-python/
|
||||||
|
https://gitee.com/it-ebooks/it-ebooks-2018-04to07/raw/master/IDAPython%20%E5%88%9D%E5%AD%A6%E8%80%85%E6%8C%87%E5%8D%97.pdf
|
||||||
|
https://www.0xaa55.com/thread-1586-1-1.html
|
||||||
|
https://wizardforcel.gitbooks.io/grey-hat-python/content/43.html
|
||||||
@ -611,19 +611,19 @@ algolia_search:
|
|||||||
|
|
||||||
# Local search
|
# Local search
|
||||||
# Dependencies: https://github.com/flashlab/hexo-generator-search
|
# Dependencies: https://github.com/flashlab/hexo-generator-search
|
||||||
local_search:
|
# local_search:
|
||||||
enable: true
|
# enable: true
|
||||||
# if auto, trigger search by changing input
|
# # if auto, trigger search by changing input
|
||||||
# if manual, trigger search by pressing enter key or search button
|
# # if manual, trigger search by pressing enter key or search button
|
||||||
trigger: auto
|
# trigger: auto
|
||||||
# show top n results per article, show all results by setting to -1
|
# # show top n results per article, show all results by setting to -1
|
||||||
top_n_per_article: 1
|
# top_n_per_article: 1
|
||||||
|
|
||||||
search:
|
# search:
|
||||||
path: search.xml
|
# path: search.xml
|
||||||
field: post
|
# field: post
|
||||||
format: html
|
# format: html
|
||||||
limit: 10000
|
# limit: 10000
|
||||||
|
|
||||||
# ---------------------------------------------------------------
|
# ---------------------------------------------------------------
|
||||||
# Tags Settings
|
# Tags Settings
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user