8000 include arduino_secrets when needed by fstasi · Pull Request #438 · arduino/arduino-ide · GitHub
[go: up one dir, main page]
Skip to content

include arduino_secrets when needed #438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 8, 2021
Merged

include arduino_secrets when needed #438

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
30b4b21
include arduino_secrets when needed
fstasi Jul 7, 2021
ba974aa
fix secret push
Jul 7, 2021
7732dfc
fix CR while adding include
fstasi Jul 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix secret push
  • Loading branch information
Alberto Iannaccone committed Jul 7, 2021
commit ba974aadd1fa269342042bb2cd2bf8eaf1c19da4
64 changes: 40 additions & 24 deletions arduino-ide-extension/src/browser/create/create-api.ts
View file
Open in desktop
10000
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ export class CreateApi {
return (sketch: Create.Sketch) => {
const [, spath] = splitSketchPath(sketch.path);
return param === spath;
}
}
};
};

async findSketchInCache(
compareFn: (sketch: Create.Sketch) => boolean,
trustCache = true,
trustCache = true
): Promise<Create.Sketch | undefined> {
const sketch = sketchCache.find((sketch) => compareFn(sketch));
if (trustCache) {
Expand Down Expand Up @@ -151,7 +151,9 @@ export class CreateApi {
}

const [, spath] = createPaths.splitSketchPath(res.path);
const sketch = await this.findSketchInCache(this.sketchCompareByPath(spath));
const sketch = await this.findSketchInCache(
this.sketchCompareByPath(spath)
);
if (
sketch &&
sketch.secrets &&
Expand All @@ -162,7 +164,9 @@ export class CreateApi {
});

if (posixPath !== posix.sep) {
const sketch = await this.findSketchInCache(this.sketchCompareByPath(posixPath));
const sketch = await this.findSketchInCache(
this.sketchCompareByPath(posixPath)
);
if (
sketch &&
sketch.secrets &&
Expand Down Expand Up @@ -217,7 +221,9 @@ export class CreateApi {

let resources;
if (basename === Create.arduino_secrets_file) {
const sketch = await this.findSketchInCache(this.sketchCompareByPath(parentPosixPath));
const sketch = await this.findSketchInCache(
this.sketchCompareByPath(parentPosixPath)
);
resources = sketch ? [this.getSketchSecretStat(sketch)] : [];
} else {
resources = await this.readDirectory(parentPosixPath, {
Expand All @@ -233,15 +239,16 @@ export class CreateApi {
return resource;
}

private async toggleSecretsInclude(path: string, data: string, mode: 'add' | 'remove') {

private async toggleSecretsInclude(
path: string,
data: string,
mode: 'add' | 'remove'
) {
const includeString = `#include "${Create.arduino_secrets_file}"`;
const includeRegexp = new RegExp(includeString + '\s*', "g");
const includeRegexp = new RegExp(includeString + 's*', 'g');

const basename = createPaths.basename(path);
if (
mode === 'add'
) {
if (mode === 'add') {
const doesIncludeSecrets = includeRegexp.test(data);

if (doesIncludeSecrets) {
Expand All @@ -250,18 +257,19 @@ export class CreateApi {

const sketch = await this.findSketchInCache((sketch) => {
const [, spath] = splitSketchPath(sketch.path);
return spath === createPaths.parentPosix(path)
return spath === createPaths.parentPosix(path);
}, true);


if (sketch &&
(sketch.name + '.ino' === basename || sketch.name + '.pde' === basename) &&
if (
sketch &&
(sketch.name + '.ino' === basename ||
sketch.name + '.pde' === basename) &&
sketch.secrets &&
sketch.secrets.length > 0) {
return includeString + "\n" + data;
sketch.secrets.length > 0
) {
return includeString + '\n' + data;
}
}
else if (mode === 'remove') {
} else if (mode === 'remove') {
return data.replace(includeRegexp, '');
}
return data;
Expand All @@ -272,7 +280,10 @@ export class CreateApi {

if (basename === Create.arduino_secrets_file) {
const parentPosixPath = createPaths.parentPosix(posixPath);
const sketch = await this.findSketchInCache(this.sketchCompareByPath(parentPosixPath), false);
const sketch = await this.findSketchInCache(
this.sketchCompareByPath(parentPosixPath),
false
);

let file = '';
if (sketch && sketch.secrets) {
Expand Down Expand Up @@ -306,7 +317,9 @@ export class CreateApi {

if (basename === Create.arduino_secrets_file) {
const parentPosixPath = createPaths.parentPosix(posixPath);
const sketch = await this.findSketchInCache(this.sketchCompareByPath(parentPosixPath));
const sketch = await this.findSketchInCache(
this.sketchCompareByPath(parentPosixPath)
);
if (sketch) {
const url = new URL(`${this.domain()}/sketches/${sketch.id}`);
const headers = await this.headers();
Expand Down Expand Up @@ -340,7 +353,7 @@ export class CreateApi {
);
}

if (name.length === 0 || value.length === 0) {
if (name.length === 0) {
return prev;
}

Expand Down Expand Up @@ -372,7 +385,10 @@ export class CreateApi {
);
const headers = await this.headers();

let data: string = typeof content === 'string' ? content : new TextDecoder().decode(content);
let data: string =
typeof content === 'string'
? content
: new TextDecoder().decode(content);
data = await this.toggleSecretsInclude(posixPath, data, 'remove');

const payload = { data: btoa(data) };
Expand Down
0